diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 48f9a089747..77ac39628e3 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -116,9 +116,8 @@ class Adherent extends CommonObject /** - * Constructor - * - * @param DoliDB $DB Database handler + * Adherent + * @param DB base de donnees */ function Adherent($DB) { diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php index 3793be3b38d..782949a2f92 100644 --- a/htdocs/adherents/class/adherent_type.class.php +++ b/htdocs/adherents/class/adherent_type.class.php @@ -49,9 +49,8 @@ class AdherentType extends CommonObject /** - * Constructor - * - * @param DoliDB $DB Database handler + * \brief AdherentType + * \param DB handler acces base de donnees */ function AdherentType($DB) { @@ -195,7 +194,6 @@ class AdherentType extends CommonObject /** * Return list of members' type - * * @return array List of types of members */ function liste_array() @@ -235,12 +233,11 @@ class AdherentType extends CommonObject /** - * Renvoie nom clicable (avec eventuellement le picto) - * - * @param withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul - * @param maxlen length max libelle - * @param option Page lien - * @return string Chaine avec URL + * \brief Renvoie nom clicable (avec eventuellement le picto) + * \param withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * \param maxlen length max libelle + * \param option Page lien + * \return string Chaine avec URL */ function getNomUrl($withpicto=0,$maxlen=0) { @@ -263,7 +260,6 @@ class AdherentType extends CommonObject /** * getMailOnValid - * * @return Return mail model */ function getMailOnValid() @@ -282,7 +278,6 @@ class AdherentType extends CommonObject /** * getMailOnSubscription - * * @return Return mail model */ function getMailOnSubscription() @@ -301,7 +296,6 @@ class AdherentType extends CommonObject /** * getMailOnResiliate - * * @return Return mail model */ function getMailOnResiliate() diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php index 5ea122c80d3..6ad16b59fdb 100755 --- a/htdocs/adherents/class/adherentstats.class.php +++ b/htdocs/adherents/class/adherentstats.class.php @@ -45,12 +45,12 @@ class AdherentStats extends Stats /** - * Constructor + * Constructor * - * @param DoliDB $DB Database handler - * @param int $socid Id third party - * @param int $userid Id user for filter - * @return AdherentStats + * @param $DB Database handler + * @param $socid Id third party + * @param $userid Id user for filter + * @return AdherentStats */ function AdherentStats($DB, $socid=0, $userid=0) { diff --git a/htdocs/adherents/class/cotisation.class.php b/htdocs/adherents/class/cotisation.class.php index 75c7749e465..7ce4ca1d80d 100644 --- a/htdocs/adherents/class/cotisation.class.php +++ b/htdocs/adherents/class/cotisation.class.php @@ -49,9 +49,8 @@ class Cotisation extends CommonObject /** - * Constructor - * - * @param DoliDB $DB Database handler + * \brief Constructor + * \param DB Handler base de donnees */ function Cotisation($DB) { @@ -60,10 +59,9 @@ class Cotisation extends CommonObject /** - * Fonction qui permet de creer la cotisation - * - * @param userid userid de celui qui insere - * @return int <0 si KO, Id cotisation cree si OK + * \brief Fonction qui permet de creer la cotisation + * \param userid userid de celui qui insere + * \return int <0 si KO, Id cotisation cree si OK */ function create($userid) { @@ -97,10 +95,9 @@ class Cotisation extends CommonObject /** - * Fonction qui permet de recuperer une cotisation - * - * @param rowid Id cotisation - * @return int <0 si KO, =0 si OK mais non trouve, >0 si OK + * \brief Fonction qui permet de recuperer une cotisation + * \param rowid Id cotisation + * \return int <0 si KO, =0 si OK mais non trouve, >0 si OK */ function fetch($rowid) { @@ -147,11 +144,10 @@ class Cotisation extends CommonObject /** - * Met a jour en base la cotisation - * - * @param user Objet user qui met a jour - * @param notrigger 0=Desactive les triggers - * @param int <0 if KO, >0 if OK + * \brief Met a jour en base la cotisation + * \param user Objet user qui met a jour + * \param notrigger 0=Desactive les triggers + * \param int <0 if KO, >0 if OK */ function update($user,$notrigger=0) { @@ -188,10 +184,9 @@ class Cotisation extends CommonObject } /** - * Delete a subscription - * - * @param rowid Id cotisation - * @return int <0 si KO, 0 si OK mais non trouve, >0 si OK + * \brief Delete a subscription + * \param rowid Id cotisation + * \return int <0 si KO, 0 si OK mais non trouve, >0 si OK */ function delete($user) { @@ -255,10 +250,9 @@ class Cotisation extends CommonObject /** - * Renvoie nom clicable (avec eventuellement le picto) - * - * @param withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul - * @return string Chaine avec URL + * \brief Renvoie nom clicable (avec eventuellement le picto) + * \param withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * \return string Chaine avec URL */ function getNomUrl($withpicto=0) { @@ -280,9 +274,8 @@ class Cotisation extends CommonObject /** - * Charge les informations d'ordre info dans l'objet cotisation - * - * @param id Id adhesion a charger + * \brief Charge les informations d'ordre info dans l'objet cotisation + * \param id Id adhesion a charger */ function info($id) { diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php index 5ac68ded510..fc7e09f60b6 100755 --- a/htdocs/adherents/stats/geo.php +++ b/htdocs/adherents/stats/geo.php @@ -168,7 +168,7 @@ dol_fiche_head($head, $tab, $langs->trans("Statistics"), 0, 'user'); // Print title -if ($mode && ! count($data)) +if ($mode && ! sizeof($data)) { print $langs->trans("NoValidatedMemberYet").'
'; print '
'; @@ -202,7 +202,7 @@ if ($mode == 'memberbycountry') print "function drawMap() {\n\tvar data = new google.visualization.DataTable();\n"; // Get the total number of rows - print "\tdata.addRows(".count($data).");\n"; + print "\tdata.addRows(".sizeof($data).");\n"; print "\tdata.addColumn('string', 'Country');\n"; print "\tdata.addColumn('number', 'Number');\n"; diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php index 58617e87df4..150122461e7 100644 --- a/htdocs/admin/notification.php +++ b/htdocs/admin/notification.php @@ -27,7 +27,6 @@ require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/includes/triggers/interface_modNotification_Notification.class.php"); $langs->load("admin"); -$langs->load("mails"); // Security check if (!$user->admin) @@ -64,7 +63,7 @@ print_fiche_titre($langs->trans("NotificationSetup"),$linkback,'setup'); print $langs->trans("NotificationsDesc").'

'; -dol_htmloutput_mesg($mesg); +if ($mesg) print $mesg.'
'; print '
'; print ''; @@ -81,7 +80,6 @@ $var=!$var; print ''; print $langs->trans("NotificationEMailFrom").''; print ''; -if (! empty($conf->global->NOTIFICATION_EMAIL_FROM) && ! isValidEmail($conf->global->NOTIFICATION_EMAIL_FROM)) print ' '.img_warning($langs->trans("BadEMail")); print ''; print ''; @@ -123,4 +121,5 @@ $db->close(); llxFooter(); + ?> diff --git a/htdocs/admin/project.php b/htdocs/admin/project.php index 26c95ece302..dc58d8c77f6 100644 --- a/htdocs/admin/project.php +++ b/htdocs/admin/project.php @@ -1,7 +1,6 @@ * Copyright (C) 2011 Laurent Destailleur - * Copyright (C) 2011 Juanjo Menent * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -43,27 +42,16 @@ $action=GETPOST('action'); * Actions */ -if ($action == 'updateMask') +if ($_POST["action"] == 'updateMask') { - $maskconstproject=GETPOST("maskconstproject"); - $maskproject=GETPOST("maskproject"); - if ($maskconstproject) $res = dolibarr_set_const($db,$maskconstproject,$maskproject,'chaine',0,'',$conf->entity); - - if (! $res > 0) $error++; - - if (! $error) - { - $mesg = "".$langs->trans("SetupSaved").""; - } - else - { - $mesg = "".$langs->trans("Error").""; - } + $maskconstproject=$_POST['maskconstproject']; + $maskproject=$_POST['maskproject']; + if ($maskconstproject) dolibarr_set_const($db,$maskconstproject,$maskproject,'chaine',0,'',$conf->entity); } -if ($action == 'specimen') +if ($_GET["action"] == 'specimen') { - $modele=GETPOST("module"); + $modele=$_GET["module"]; $project = new Project($db); $project->initAsSpecimen(); @@ -96,16 +84,13 @@ if ($action == 'specimen') } } -if ($action == 'set') +if ($_GET["action"] == 'set') { - $label = GETPOST("label"); - $scandir = GETPOST("scandir"); - $type='project'; $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)"; - $sql.= " VALUES ('".$db->escape($value)."','".$type."',".$conf->entity.", "; - $sql.= ($label?"'".$db->escape($label)."'":'null').", "; - $sql.= (! empty($scandir)?"'".$db->escape($scandir)."'":"null"); + $sql.= " VALUES ('".$db->escape($_GET["value"])."','".$type."',".$conf->entity.", "; + $sql.= ($_GET["label"]?"'".$db->escape($_GET["label"])."'":'null').", "; + $sql.= (! empty($_GET["scandir"])?"'".$db->escape($_GET["scandir"])."'":"null"); $sql.= ")"; if ($db->query($sql)) { @@ -113,7 +98,7 @@ if ($action == 'set') } } -if ($action == 'del') +if ($_GET["action"] == 'del') { $type='project'; $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model"; @@ -126,30 +111,27 @@ if ($action == 'del') } } -if ($action == 'setdoc') +if ($_GET["action"] == 'setdoc') { - $label = GETPOST("label"); - $scandir = GETPOST("scandir"); - $db->begin(); - if (dolibarr_set_const($db, "PROJECT_ADDON_PDF",$value,'chaine',0,'',$conf->entity)) + if (dolibarr_set_const($db, "PROJECT_ADDON_PDF",$_GET["value"],'chaine',0,'',$conf->entity)) { - $conf->global->PROJECT_ADDON_PDF = $value; + $conf->global->PROJECT_ADDON_PDF = $_GET["value"]; } // On active le modele $type='project'; $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model"; - $sql_del.= " WHERE nom = '".$db->escape($value)."'"; + $sql_del.= " WHERE nom = '".$db->escape($_GET["value"])."'"; $sql_del.= " AND type = '".$type."'"; $sql_del.= " AND entity = ".$conf->entity; $result1=$db->query($sql_del); $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)"; - $sql.= " VALUES ('".$db->escape($value)."', '".$type."', ".$conf->entity.", "; - $sql.= ($label?"'".$db->escape($label)."'":'null').", "; - $sql.= (! empty($scandir)?"'".$db->escape($scandir)."'":"null"); + $sql.= " VALUES ('".$db->escape($_GET["value"])."', '".$type."', ".$conf->entity.", "; + $sql.= ($_GET["label"]?"'".$db->escape($_GET["label"])."'":'null').", "; + $sql.= (! empty($_GET["scandir"])?"'".$db->escape($_GET["scandir"])."'":"null"); $sql.= ")"; $result2=$db->query($sql); if ($result1 && $result2) @@ -162,7 +144,7 @@ if ($action == 'setdoc') } } -if ($action == 'setmod') +if ($_GET["action"] == 'setmod') { // TODO Verifier si module numerotation choisi peut etre active // par appel methode canBeActivated @@ -398,9 +380,5 @@ if (is_resource($handle)) print '
'; -dol_htmloutput_mesg($mesg); - -$db->close(); - llxFooter(); ?> diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index 05dd38b43c1..6e2642c0cb1 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -380,7 +380,7 @@ class FormMail $liste=array(); $soc=new Societe($this->db); $soc->fetch($this->withtosocid); - foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value) + foreach ($soc->thirdparty_and_contact_email_array() as $key=>$value) { $liste[$key]=$value; } @@ -414,7 +414,7 @@ class FormMail $liste=array(); $soc=new Societe($this->db); $soc->fetch($this->withtoccsocid); - foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value) + foreach ($soc->thirdparty_and_contact_email_array() as $key=>$value) { $liste[$key]=$value; } @@ -448,7 +448,7 @@ class FormMail $liste=array(); $soc=new Societe($this->db); $soc->fetch($this->withtosocid); - foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value) + foreach ($soc->thirdparty_and_contact_email_array() as $key=>$value) { $liste[$key]=$value; } diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 44369ab7634..bbcdfc2ff5b 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -193,7 +193,7 @@ else else { # If failed, we try to create an empty file - dolibarr_install_syslog("failed to copy file ".$conffile.".example into ".$conffile.". We try to create it.", LOG_WARNING); + dolibarr_install_syslog("failed to copy file ".$conffile.".example into ".$conffile.". We try to create it."); $fp = @fopen($conffile, "w"); if ($fp) @@ -203,7 +203,6 @@ else @fputs($fp,"?>"); fclose($fp); } - else dolibarr_install_syslog("failed to create a new file ".$conffile." into current dir ".getcwd().". Check permission.", LOG_ERR); } // First install, on ne peut pas upgrader diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index b766c82ac11..348d1d3255d 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -1545,16 +1545,14 @@ class Societe extends CommonObject /** * Return list of contacts emails existing for third party - * - * @param int $addthirdparty 1=Add also a record for thirdparty email - * @return array Array of contacts emails + * @return array Array of contacts emails */ - function thirdparty_and_contact_email_array($addthirdparty=0) + function thirdparty_and_contact_email_array() { global $langs; $contact_emails = $this->contact_property_array('email'); - if ($this->email && $addthirdparty) + if ($this->email) { if (empty($this->name)) $this->name=$this->nom; // TODO: Tester si email non deja present dans tableau contact @@ -1565,7 +1563,6 @@ class Societe extends CommonObject /** * Return list of contacts mobile phone existing for third party - * * @return array Array of contacts emails */ function thirdparty_and_contact_phone_array() @@ -1584,7 +1581,6 @@ class Societe extends CommonObject /** * Return list of contacts emails or mobile existing for third party - * * @param mode 'email' or 'mobile' * @return array Array of contacts emails or mobile */ @@ -1595,7 +1591,6 @@ class Societe extends CommonObject $sql = "SELECT rowid, email, phone_mobile, name, firstname"; $sql.= " FROM ".MAIN_DB_PREFIX."socpeople"; $sql.= " WHERE fk_soc = '".$this->id."'"; - $resql=$this->db->query($sql); if ($resql) { @@ -1622,9 +1617,8 @@ class Societe extends CommonObject /** - * Renvoie la liste des contacts de cette societe - * - * @return array tableau des contacts + * \brief Renvoie la liste des contacts de cette societe + * \return array tableau des contacts */ function contact_array() { @@ -1655,7 +1649,6 @@ class Societe extends CommonObject /** * Return property of contact from its id - * * @param rowid id of contact * @param mode 'email' or 'mobile' * @return string email of contact @@ -1691,9 +1684,7 @@ class Societe extends CommonObject /** - * Return bank number property of thirdparty - * - * @return string Bank number + * \brief Affiche le rib */ function display_rib() { diff --git a/htdocs/societe/notify/fiche.php b/htdocs/societe/notify/fiche.php index 13f9dd0dcc0..4cd8d8b046f 100644 --- a/htdocs/societe/notify/fiche.php +++ b/htdocs/societe/notify/fiche.php @@ -33,12 +33,8 @@ $langs->load("mails"); $langs->load("admin"); $langs->load("other"); -$socid = GETPOST("socid",'int'); -$action = GETPOST('action'); -$contactid=GETPOST('contactid'); // May be an int or 'thirdparty' -$actionid=GETPOST('actionid'); - // Security check +$socid = isset($_GET["socid"])?$_GET["socid"]:''; if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'societe','',''); @@ -52,71 +48,41 @@ $pagenext = $page + 1; if (! $sortorder) $sortorder="ASC"; if (! $sortfield) $sortfield="c.name"; -$now=dol_now(); - /* - * Actions + * Action */ // Add a notification -if ($action == 'add') +if ($_POST["action"] == 'add') { - $error=0; + $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def"; + $sql .= " WHERE fk_soc=".$socid." AND fk_contact=".$_POST["contactid"]." AND fk_action=".$_POST["actionid"]; + if ($db->query($sql)) + { + $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_soc, fk_contact, fk_action)"; + $sql .= " VALUES (".$db->idate(mktime()).",".$socid.",".$_POST["contactid"].",".$_POST["actionid"].")"; - if (empty($contactid)) - { - $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Contact")).'
'; - $error++; - } - if ($actionid <= 0) - { - $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Action")).'
'; - $error++; - } + if ($db->query($sql)) + { - if (! $error) - { - $db->begin(); - - $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def"; - $sql .= " WHERE fk_soc=".$socid." AND fk_contact=".$contactid." AND fk_action=".$actionid; - if ($db->query($sql)) - { - $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_soc, fk_contact, fk_action)"; - $sql .= " VALUES ('".$db->idate($now)."',".$socid.",".$contactid.",".$actionid.")"; - - if ($db->query($sql)) - { - - } - else - { - $error++; - dol_print_error($db); - } - } - else - { - dol_print_error($db); - } - - if (! $error) - { - $db->commit(); - } - else - { - $db->rollback(); - } - } + } + else + { + dol_print_error($db); + } + } + else + { + dol_print_error($db); + } } // Remove a notification -if ($action == 'delete') +if ($_GET["action"] == 'delete') { - $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".$_GET["actid"].";"; - $db->query($sql); + $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".$_GET["actid"].";"; + $db->query($sql); } @@ -129,106 +95,79 @@ $form = new Form($db); llxHeader(); -$object = new Societe($db); -$result=$object->fetch($socid); +$soc = new Societe($db); +$soc->id = $socid; -if ($result > 0) +if ( $soc->fetch($soc->id) ) { - $html = new Form($db); - $langs->load("other"); + $html = new Form($db); + $langs->load("other"); - $head = societe_prepare_head($object); + $head = societe_prepare_head($soc); - dol_fiche_head($head, 'notify', $langs->trans("ThirdParty"),0,'company'); + dol_fiche_head($head, 'notify', $langs->trans("ThirdParty"),0,'company'); - print ''; + print '
'; - print ''; + print ''; - // Prefix - if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field - { - print ''; - } + print ''; + print ''; + print '
'.$langs->trans("ThirdPartyName").''; - print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom'); - print '
'.$langs->trans("ThirdPartyName").''; + print $form->showrefnav($soc,'socid','',($user->societe_id?0:1),'rowid','nom'); + print '
'.$langs->trans('Prefix').''.$object->prefix_comm.'
'.$langs->trans("NbOfActiveNotifications").''; + $sql = "SELECT COUNT(n.rowid) as nb"; + $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n"; + $sql.= " WHERE fk_soc = ".$soc->id; + $resql=$db->query($sql); + if ($resql) + { + $num = $db->num_rows($resql); + $i = 0; + while ($i < $num) + { + $obj = $db->fetch_object($resql); + $nb=$obj->nb; + $i++; + } + } + else { + dol_print_error($db); + } + print $nb; + print '
'; - if ($object->client) - { - print ''; - print $langs->trans('CustomerCode').''; - print $object->code_client; - if ($object->check_codeclient() <> 0) print ' ('.$langs->trans("WrongCustomerCode").')'; - print ''; - } - - if ($object->fournisseur) - { - print ''; - print $langs->trans('SupplierCode').''; - print $object->code_fournisseur; - if ($object->check_codefournisseur() <> 0) print ' ('.$langs->trans("WrongSupplierCode").')'; - print ''; - } - - print ''.$langs->trans("NbOfActiveNotifications").''; - print ''; - $sql = "SELECT COUNT(n.rowid) as nb"; - $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n"; - $sql.= " WHERE fk_soc = ".$object->id; - $resql=$db->query($sql); - if ($resql) - { - $num = $db->num_rows($resql); - $i = 0; - while ($i < $num) - { - $obj = $db->fetch_object($resql); - $nb=$obj->nb; - $i++; - } - } - else { - dol_print_error($db); - } - print $nb; - print ''; - print ''; - - // Help - print '
'.$langs->trans("NotificationsDesc").'
'; + print ''; - dol_fiche_end(); + // Help + print $langs->trans("NotificationsDesc").'

'; - print "\n"; + print "\n"; - // Add notification form - print_fiche_titre($langs->trans("AddNewNotification"),'',''); + // Add notification form + print_fiche_titre($langs->trans("AddNewNotification"),'',''); - print ''; - print ''; - print ''; + print ''; + print ''; - $param="&socid=".$socid; - - // Line with titles - print ''; - print ''; - print_liste_field_titre($langs->trans("Contact"),"fiche.php","c.name",'',$param,'"width="45%"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Action"),"fiche.php","a.titre",'',$param,'"width="35%"',$sortfield,$sortorder); + // Line with titles + print '
'; + print ''; + $param="&socid=".$socid; + print_liste_field_titre($langs->trans("Contact"),"fiche.php","c.name",'',$param,'"width="45%"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Action"),"fiche.php","a.titre",'',$param,'"width="35%"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Type"),"fiche.php","",'',$param,'"width="10%"',$sortfield,$sortorder); - print_liste_field_titre(''); - print ''; + print ''; + print ''; - $var=false; - $listofemails=$object->thirdparty_and_contact_email_array(); - if (count($listofemails) > 0) - { - $actions=array(); + $var=false; + if (count($soc->thirdparty_and_contact_email_array()) > 0) + { + $actions=array(); // Load array of available notifications $notificationtrigger=new InterfaceNotification($db); @@ -239,174 +178,173 @@ if ($result > 0) $label=$langs->trans("Notify_".$notifiedevent['code'])!=$langs->trans("Notify_".$notifiedevent['code'])?$langs->trans("Notify_".$notifiedevent['code']):$notifiedevent['label']; $actions[$notifiedevent['rowid']]=$label; } - print ''; - print ''; + print ''; + print ''; + print ''; print ''; - print ''; - print ''; - } - else - { - print ''; - } + print ''; + print ''; + } + else + { + print ''; + } - print '
 
'; - print $html->selectarray("contactid",$listofemails); - print ''; - print $html->selectarray("actionid",$actions,'',1); - print '
'; + print $html->selectarray("contactid",$soc->thirdparty_and_contact_email_array()); + print ''; + print $html->selectarray("actionid",$actions,'',1); + print ''; $type=array('email'=>$langs->trans("EMail")); print $html->selectarray("typeid",$type); print '
'; - print $langs->trans("YouMustCreateContactFirst"); - print '
'; + print $langs->trans("YouMustCreateContactFirst"); + print '
'; + print ''; - print ''; - print '
'; + print ''; + print '
'; - dol_htmloutput_mesg($mesg); - // List of active notifications - print_fiche_titre($langs->trans("ListOfActiveNotifications"),'',''); - $var=true; + // List of active notifications + print_fiche_titre($langs->trans("ListOfActiveNotifications"),'',''); + $var=true; - // Line with titles - print ''; - print ''; - print_liste_field_titre($langs->trans("Contact"),"fiche.php","c.name",'',$param,'"width="45%"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Action"),"fiche.php","a.titre",'',$param,'"width="35%"',$sortfield,$sortorder); + // Line with titles + print '
'; + print ''; + print_liste_field_titre($langs->trans("Contact"),"fiche.php","c.name",'',$param,'"width="45%"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Action"),"fiche.php","a.titre",'',$param,'"width="35%"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Type"),"fiche.php","",'',$param,'"width="10%"',$sortfield,$sortorder); - print_liste_field_titre('','',''); - print ''; + print_liste_field_titre('','',''); + print ''; - // List of notifications for contacts - $sql = "SELECT n.rowid, n.type,"; - $sql.= " a.code, a.label,"; + // List of notifications for contacts + $sql = "SELECT n.rowid, n.type,"; + $sql.= " a.code, a.label,"; $sql.= " c.rowid as contactid, c.name, c.firstname, c.email"; - $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,"; - $sql.= " ".MAIN_DB_PREFIX."notify_def as n,"; - $sql.= " ".MAIN_DB_PREFIX."socpeople c"; - $sql.= " WHERE a.rowid = n.fk_action"; - $sql.= " AND c.rowid = n.fk_contact"; - $sql.= " AND c.fk_soc = ".$object->id; + $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,"; + $sql.= " ".MAIN_DB_PREFIX."notify_def as n,"; + $sql.= " ".MAIN_DB_PREFIX."socpeople c"; + $sql.= " WHERE a.rowid = n.fk_action"; + $sql.= " AND c.rowid = n.fk_contact"; + $sql.= " AND c.fk_soc = ".$soc->id; - $resql=$db->query($sql); - if ($resql) - { - $num = $db->num_rows($resql); - $i = 0; + $resql=$db->query($sql); + if ($resql) + { + $num = $db->num_rows($resql); + $i = 0; - $contactstatic=new Contact($db); + $contactstatic=new Contact($db); - while ($i < $num) - { - $var = !$var; + while ($i < $num) + { + $var = !$var; - $obj = $db->fetch_object($resql); + $obj = $db->fetch_object($resql); - $contactstatic->id=$obj->contactid; - $contactstatic->name=$obj->name; - $contactstatic->firstname=$obj->firstname; - print ''; - print ''; + $contactstatic->id=$obj->contactid; + $contactstatic->name=$obj->name; + $contactstatic->firstname=$obj->firstname; + print ''; + print ''; print ''; print ''; - print ''; - $i++; - } - $db->free($resql); - } - else - { - dol_print_error($db); - } + print ''; + $i++; + } + $db->free($resql); + } + else + { + dol_print_error($db); + } - print '
'.$contactstatic->getNomUrl(1); - if ($obj->type == 'email') - { - if (isValidEmail($obj->email)) - { - print ' <'.$obj->email.'>'; - } - else - { - $langs->load("errors"); - print '   '.img_warning().' '.$langs->trans("ErrorBadEMail",$obj->email); - } - } - print ''; - $label=($langs->trans("Notify_".$obj->code)!="Notify_".$obj->code?$langs->trans("Notify_".$obj->code):$obj->label); - print $label; - print '
'.$contactstatic->getNomUrl(1); + if ($obj->type == 'email') + { + if (isValidEmail($obj->email)) + { + print ' <'.$obj->email.'>'; + } + else + { + $langs->load("errors"); + print '   '.img_warning().' '.$langs->trans("ErrorBadEMail",$obj->email); + } + } + print ''; + $label=($langs->trans("Notify_".$obj->code)!="Notify_".$obj->code?$langs->trans("Notify_".$obj->code):$obj->label); + print $label; + print ''; if ($obj->type == 'email') print $langs->trans("Email"); if ($obj->type == 'sms') print $langs->trans("SMS"); print ''.img_delete().'
'; - print '
'; + print ''; + print '
'; - // List of notifications done - print_fiche_titre($langs->trans("ListOfNotificationsDone"),'',''); - $var=true; + // List of notifications done + print_fiche_titre($langs->trans("ListOfNotificationsDone"),'',''); + $var=true; - // Line with titles - print ''; - print ''; - print_liste_field_titre($langs->trans("Contact"),"fiche.php","c.name",'',$param,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Action"),"fiche.php","a.titre",'',$param,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Date"),"fiche.php","a.daten",'',$param,'align="right"',$sortfield,$sortorder); - print ''; + // Line with titles + print '
'; + print ''; + print_liste_field_titre($langs->trans("Contact"),"fiche.php","c.name",'',"&socid=$socid",'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Action"),"fiche.php","a.titre",'',"&socid=$socid",'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Date"),"fiche.php","a.titre",'',"&socid=$socid",'align="right"',$sortfield,$sortorder); + print ''; - // List - $sql = "SELECT n.rowid, n.daten, n.email, n.objet_type, n.objet_id,"; - $sql.= " c.rowid as id, c.name, c.firstname, c.email,"; - $sql.= " a.code, a.label"; - $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,"; - $sql.= " ".MAIN_DB_PREFIX."notify as n, "; + // List + $sql = "SELECT n.rowid, n.daten, n.email, n.objet_type, n.objet_id,"; + $sql.= " c.rowid as id, c.name, c.firstname, c.email,"; + $sql.= " a.code, a.label"; + $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,"; + $sql.= " ".MAIN_DB_PREFIX."notify as n, "; $sql.= " ".MAIN_DB_PREFIX."socpeople as c"; $sql.= " WHERE a.rowid = n.fk_action"; $sql.= " AND c.rowid = n.fk_contact"; - $sql.= " AND c.fk_soc = ".$object->id; + $sql.= " AND c.fk_soc = ".$soc->id; - $resql=$db->query($sql); - if ($resql) - { - $num = $db->num_rows($resql); - $i = 0; + $resql=$db->query($sql); + if ($resql) + { + $num = $db->num_rows($resql); + $i = 0; - $contactstatic=new Contact($db); + $contactstatic=new Contact($db); - while ($i < $num) - { - $var = !$var; + while ($i < $num) + { + $var = !$var; - $obj = $db->fetch_object($resql); + $obj = $db->fetch_object($resql); - $contactstatic->id=$obj->id; - $contactstatic->name=$obj->name; - $contactstatic->firstname=$obj->firstname; - print ''; - print ''; - // TODO Add link to object here - // print - print''; - print ''; - $i++; - } - $db->free($resql); - } - else - { - dol_print_error($db); - } + $contactstatic->id=$obj->id; + $contactstatic->name=$obj->name; + $contactstatic->firstname=$obj->firstname; + print ''; + print ''; + // TODO Add link to object here + // print + print''; + print ''; + $i++; + } + $db->free($resql); + } + else + { + dol_print_error($db); + } - print '
'.$contactstatic->getNomUrl(1); - print $obj->email?' <'.$obj->email.'>':$langs->trans("NoMail"); - print ''; - $label=($langs->trans("Notify_".$obj->code)!="Notify_".$obj->code?$langs->trans("Notify_".$obj->code):$obj->label); - print $label; - print ''.dol_print_date($db->jdate($obj->daten), 'dayhour').'
'.$contactstatic->getNomUrl(1); + print $obj->email?' <'.$obj->email.'>':$langs->trans("NoMail"); + print ''; + $label=($langs->trans("Notify_".$obj->code)!="Notify_".$obj->code?$langs->trans("Notify_".$obj->code):$obj->label); + print $label; + print ''.dol_print_date($db->jdate($obj->daten), 'dayhour').'
'; + print ''; } -else dol_print_error('','RecordNotFound'); $db->close(); diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index fb0d19d721c..b5ad431ea80 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -1248,7 +1248,6 @@ th.liste_titre, td.liste_titre font-weight: normal; /* border-bottom: 1px solid #FDFFFF; */ white-space: nowrap; - text-align: ; } th.liste_titre_sel, td.liste_titre_sel { @@ -1261,7 +1260,6 @@ th.liste_titre_sel, td.liste_titre_sel /* text-decoration: underline; */ /* border-bottom: 1px solid #FDFFFF; */ white-space: nowrap; - text-align: ; } input.liste_titre { background: transparent; diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index 7312b757d11..404fee28c28 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -1439,7 +1439,6 @@ th.liste_titre, td.liste_titre white-space: nowrap; background-image: none; background: none; - text-align: ; } /*tr.liste_titre select.flat { @@ -1455,8 +1454,7 @@ tr.liste_titre input.button { /*margin: 30px 10px 10px 0px;*/ } -th.liste_titre_sel, td.liste_titre_sel -{ +td.liste_titre_sel { background: #505050; background-repeat: repeat-x; color: #FFFFFF; @@ -1465,7 +1463,6 @@ th.liste_titre_sel, td.liste_titre_sel /* text-decoration: underline; */ /* border-bottom: 1px solid #FDFFFF; */ white-space: nowrap; - text-align: ; } input.liste_titre { diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index 42f43efc8c8..6a8e369979c 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -1355,7 +1355,6 @@ th.liste_titre, td.liste_titre padding-left: 6px; padding-right: 6px; /*vertical-align: text-top;*/ - text-align: ; } th.liste_titre_sel, td.liste_titre_sel { @@ -1363,7 +1362,6 @@ th.liste_titre_sel, td.liste_titre_sel color: #A51B00; font-weight: bold; white-space: nowrap; - text-align: ; } input.liste_titre { diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 58e2ced4c1e..ba4b2f855d4 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1266,7 +1266,6 @@ th.liste_titre, td.liste_titre font-weight: normal; border-bottom: 1px solid #FDFFFF; white-space: nowrap; - text-align: ; } th.liste_titre_sel, td.liste_titre_sel { @@ -1278,7 +1277,6 @@ th.liste_titre_sel, td.liste_titre_sel font-weight: normal; border-bottom: 1px solid #FDFFFF; white-space: nowrap; - text-align: ; } input.liste_titre { background: #7699A9; diff --git a/htdocs/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php index 4145de0a326..89048687034 100644 --- a/htdocs/theme/phones/smartphone/theme/default/default.css.php +++ b/htdocs/theme/phones/smartphone/theme/default/default.css.php @@ -316,37 +316,33 @@ padding: 0px 0px; -tr.liste_titre -{ - height: 24px; - background: -moz-linear-gradient(center top , #81A8CE, #5E87B0) repeat scroll 0 0 #5E87B0; - border: 1px solid #456F9A; - color: #FFFFFF; - font-family: ; - /* border-bottom: 1px solid #FDFFFF; */ - white-space: nowrap; +tr.liste_titre { +height: 24px; +background: -moz-linear-gradient(center top , #81A8CE, #5E87B0) repeat scroll 0 0 #5E87B0; +border: 1px solid #456F9A; +color: #FFFFFF; +font-family: ; +/* border-bottom: 1px solid #FDFFFF; */ +white-space: nowrap; } -th.liste_titre, td.liste_titre -{ - background: -moz-linear-gradient(center top , #81A8CE, #5E87B0) repeat scroll 0 0 #5E87B0; - border: 1px solid #456F9A; - color: #FFFFFF; - font-family: ; - font-weight: normal; - /* border-bottom: 1px solid #FDFFFF; */ - white-space: nowrap; - text-align: ; +td.liste_titre { +background: -moz-linear-gradient(center top , #81A8CE, #5E87B0) repeat scroll 0 0 #5E87B0; +border: 1px solid #456F9A; +color: #FFFFFF; +font-family: ; +font-weight: normal; +/* border-bottom: 1px solid #FDFFFF; */ +white-space: nowrap; } -th.liste_titre_sel, td.liste_titre_sel +td.liste_titre_sel { - background: -moz-linear-gradient(center top , #81A8CE, #5E87B0) repeat scroll 0 0 #5E87B0; - color: #FFFFFF; - font-family: ; - font-weight: normal; - /* text-decoration: underline; */ - /* border-bottom: 1px solid #FDFFFF; */ - white-space: nowrap; - text-align: ; +background: -moz-linear-gradient(center top , #81A8CE, #5E87B0) repeat scroll 0 0 #5E87B0; +color: #FFFFFF; +font-family: ; +font-weight: normal; +/* text-decoration: underline; */ +/* border-bottom: 1px solid #FDFFFF; */ +white-space: nowrap; } input.liste_titre { background: transparent;