diff --git a/dev/skeletons/skeleton_class.class.php b/dev/skeletons/skeleton_class.class.php index a9fdb4ffa5f..6fb509bfc51 100644 --- a/dev/skeletons/skeleton_class.class.php +++ b/dev/skeletons/skeleton_class.class.php @@ -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; } diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index 71777209198..21c07e36fc0 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -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 = ''; @@ -435,7 +434,7 @@ if (! empty($_POST['addfile'])) $mil->fetch($_POST["id"]); $upload_dir = $conf->mailing->dir_output . "/" . get_exdir($mil->id,2,0,1); - + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); // Set tmp user directory @@ -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)) { @@ -983,7 +982,7 @@ else print ''.$langs->trans("MailTopic").''; dol_init_file_process($upload_dir); - + // Joined files $addfileaction='addfile'; print ''.$langs->trans("MailFile").''; diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index ba9c9371213..5390fce71a5 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -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(); /* diff --git a/htdocs/comm/mailing/liste.php b/htdocs/comm/mailing/liste.php index 967d2903517..9cd6ed5e064 100644 --- a/htdocs/comm/mailing/liste.php +++ b/htdocs/comm/mailing/liste.php @@ -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 ''; print ''; - 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 "\n"; - print ''; + print ''; print ''; print '
'; print ''; diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php index 69af4abe928..9deeaa34014 100644 --- a/htdocs/core/class/html.formadmin.class.php +++ b/htdocs/core/class/html.formadmin.class.php @@ -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) {