Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Uniformize code

Browse Source
This commit is contained in:
Laurent Destailleur
2011-12-17 13:51:31 +01:00
parent 437a6f699e
commit 484d0c82bf
5 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dev/skeletons/skeleton_class.class.php
View File

@@ -52,11 +52,11 @@ class Skeleton_Class // extends CommonObject
/**
* Constructor
*
* @param DoliDb $DB Database handler
* @param DoliDb $db Database handler
*/
function Skeleton_Class($DB)
function Skeleton_Class($db)
{
$this->db = $DB;
$this->db = $db;
return 1;
}

5
htdocs/comm/mailing/fiche.php
View File

@@ -32,8 +32,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php");
$langs->load("mails");
if (! $user->rights->mailing->lire || $user->societe_id > 0)
accessforbidden();
if (! $user->rights->mailing->lire || $user->societe_id > 0) accessforbidden();
$message = '';
@@ -576,7 +575,7 @@ if ($_REQUEST["action"] == 'confirm_delete')
if ($_REQUEST["confirm"] == 'yes')
{
$mil = new Mailing($db);
$mil->id = $_REQUEST["id"];
$mil->fetch($_REQUEST["id"]);
if ($mil->delete($mil->id))
{

3
htdocs/comm/mailing/index.php
View File

@@ -30,8 +30,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
$langs->load("commercial");
$langs->load("orders");
if (! $user->rights->mailing->lire || $user->societe_id > 0)
accessforbidden();
if (! $user->rights->mailing->lire || $user->societe_id > 0) accessforbidden();
/*

18
htdocs/comm/mailing/liste.php
View File

@@ -97,7 +97,7 @@ if ($result)
$title=$langs->trans("ListOfEMailings");
if ($filteremail) $title.=' ('.$langs->trans("SentTo",$filteremail).')';
print_barre_liste($title, $page, "liste.php","",$sortfield,$sortorder,"",$num);
print_barre_liste($title, $page, $_SERVER["PHP_SELF"],"",$sortfield,$sortorder,"",$num);
$i = 0;
@@ -106,16 +106,16 @@ if ($result)
print '<table class="liste">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Ref"),"liste.php","m.rowid",$param,"","",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Title"),"liste.php","m.titre",$param,"","",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("DateCreation"),"liste.php","m.date_creat",$param,"",'align="center"',$sortfield,$sortorder);
if (! $filteremail) print_liste_field_titre($langs->trans("NbOfEMails"),"liste.php","m.nbemail",$param,"",'align="center"',$sortfield,$sortorder);
if (! $filteremail) print_liste_field_titre($langs->trans("DateLastSend"),"liste.php","m.date_envoi",$param,"",'align="center"',$sortfield,$sortorder);
else print_liste_field_titre($langs->trans("DateSending"),"liste.php","mc.date_envoi",$param,"",'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Status"),"liste.php",($filteremail?"mc.statut":"m.statut"),$param,"",'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"m.rowid",$param,"","",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Title"),$_SERVER["PHP_SELF"],"m.titre",$param,"","",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"m.date_creat",$param,"",'align="center"',$sortfield,$sortorder);
if (! $filteremail) print_liste_field_titre($langs->trans("NbOfEMails"),$_SERVER["PHP_SELF"],"m.nbemail",$param,"",'align="center"',$sortfield,$sortorder);
if (! $filteremail) print_liste_field_titre($langs->trans("DateLastSend"),$_SERVER["PHP_SELF"],"m.date_envoi",$param,"",'align="center"',$sortfield,$sortorder);
else print_liste_field_titre($langs->trans("DateSending"),$_SERVER["PHP_SELF"],"mc.date_envoi",$param,"",'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],($filteremail?"mc.statut":"m.statut"),$param,"",'align="right"',$sortfield,$sortorder);
print "</tr>\n";
print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">';
print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
print '<tr class="liste_titre">';
print '<td class="liste_titre">';
print '<input type="text" class="flat" name="sref" value="'.$sref.'" size="6">';

20
htdocs/core/class/html.formadmin.class.php
View File

@@ -37,11 +37,11 @@ class FormAdmin
/**
* Constructor
*
* @param DoliDB $DB Database handler
* @param DoliDB $db Database handler
*/
function FormAdmin($DB)
function FormAdmin($db)
{
$this->db = $DB;
$this->db = $db;
return 1;
}
@@ -63,12 +63,14 @@ class FormAdmin
/**
* Return html select list with available languages (key='en_US', value='United States' for example)
* @param selected Langue pre-selectionnee
* @param htmlname Nom de la zone select
* @param showauto Affiche choix auto
* @param filter Array of keys to exclude in list
* @param showempty Add empty value
* @param showwarning Show a warning if language is not complete
*
* @param string $selected Langue pre-selectionnee
* @param string $htmlname Nom de la zone select
* @param int $showauto Affiche choix auto
* @param array $filter Array of keys to exclude in list
* @param int $showempty Add empty value
* @param int $showwarning Show a warning if language is not complete
* @return string Return HTML select string with list of languages
*/
function select_language($selected='',$htmlname='lang_id',$showauto=0,$filter=0,$showempty=0,$showwarning=0)
{