diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php index df5d7c740f3..d9487e658de 100644 --- a/htdocs/admin/menus/edit.php +++ b/htdocs/admin/menus/edit.php @@ -261,7 +261,7 @@ if ($action == 'create') if ($res) { - while ($menu = $db->fetch_array($res)) + while ($menu = $db->fetch_array ($res)) { $parent_rowid = $menu['rowid']; $parent_mainmenu = $menu['mainmenu']; diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php index c21503b15d2..9a72df931d8 100644 --- a/htdocs/admin/menus/index.php +++ b/htdocs/admin/menus/index.php @@ -300,7 +300,7 @@ if ($conf->use_javascript_ajax) $num = $db->num_rows($res); $i = 1; - while ($menu = $db->fetch_array($res)) + while ($menu = $db->fetch_array ($res)) { if (! empty($menu['langs'])) $langs->load($menu['langs']); $titre = $langs->trans($menu['titre']); diff --git a/htdocs/admin/menus/menu.js.php b/htdocs/admin/menus/menu.js.php index 8526569f1fc..89a04a11dee 100644 --- a/htdocs/admin/menus/menu.js.php +++ b/htdocs/admin/menus/menu.js.php @@ -32,7 +32,7 @@ if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU',1); if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1); if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); -session_cache_limiter(FALSE); +session_cache_limiter( FALSE ); require_once("../../master.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php"); 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/comm/propal.php b/htdocs/comm/propal.php index b9fe58eed1f..0775afdf83f 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1804,7 +1804,7 @@ else print_liste_field_titre($langs->trans('Price'),$_SERVER["PHP_SELF"],'p.total_ht','',$param, 'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans('Author'),$_SERVER["PHP_SELF"],'u.login','',$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans('Status'),$_SERVER["PHP_SELF"],'p.fk_statut','',$param,'align="right"',$sortfield,$sortorder); - print_liste_field_titre(''); + print ' '; print "\n"; // Lignes des champs de filtre print ''; 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/lib/functions.lib.php b/htdocs/lib/functions.lib.php index c5f2144ce8c..afb4aea298c 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -2572,70 +2572,78 @@ function print_liste_field_titre($name, $file="", $field="", $begin="", $morepar /** * Get title line of an array - * * @param name Label of field * @param thead For thead format * @param file Url used when we click on sort picto * @param field Field to use for new sorting * @param begin ("" by defaut) * @param moreparam Add more parameters on sort url links ("" by default) - * @param moreattrib Add more attributes on th ("" by defaut) + * @param td Options of attribute td ("" by defaut) * @param sortfield Current field used to sort * @param sortorder Current sort order */ -function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $moreparam="", $moreattrib="", $sortfield="", $sortorder="") +function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $moreparam="", $td="", $sortfield="", $sortorder="") { global $conf; - //print "$name, $file, $field, $begin, $options, $moreattrib, $sortfield, $sortorder
\n"; + //print "$name, $file, $field, $begin, $options, $td, $sortfield, $sortorder
\n"; $out=''; - // If field is used as sort criteria we use a specific class - // Example if (sortfield,field)=("nom","xxx.nom") or (sortfield,field)=("nom","nom") - if ($field && ($sortfield == $field || $sortfield == preg_replace("/^[^\.]+\./","",$field))) + + if ($thead) { - $out.= ''; + $out.= ''.$name.''; } else { - $out.= ''; - } - $out.=$name; + // Le champ de tri est mis en evidence. + // Exemple si (sortfield,field)=("nom","xxx.nom") ou (sortfield,field)=("nom","nom") + if ($field && ($sortfield == $field || $sortfield == preg_replace("/^[^\.]+\./","",$field))) + { + $out.= ''; + } + else + { + $out.= ''; + } + $out.= $name; - if (empty($thead) && $field) // If this is a sort field - { - $options=preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i','',$moreparam); - $options=preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i','',$options); - $options=preg_replace('/&+/i','&',$options); - if (! preg_match('/^&/',$options)) $options='&'.$options; + // If this is a sort field + if ($field) + { + $options=preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i','',$moreparam); + $options=preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i','',$options); + $options=preg_replace('/&+/i','&',$options); + if (! preg_match('/^&/',$options)) $options='&'.$options; - //print " "; - $out.= ''; - if (! $sortorder) - { - $out.= ''.img_down("A-Z",0).''; - $out.= ''.img_up("Z-A",0).''; - } - else - { - if ($field != $sortfield) - { - $out.= ''.img_down("A-Z",0).''; - $out.= ''.img_up("Z-A",0).''; - } - else { - $sortorder=strtoupper($sortorder); - if ($sortorder == 'DESC' ) { - $out.= ''.img_down("A-Z",0).''; - $out.= ''.img_up("Z-A",1).''; - } - if ($sortorder == 'ASC' ) { - $out.= ''.img_down("A-Z",1).''; - $out.= ''.img_up("Z-A",0).''; - } - } - } + //print " "; + $out.= ''; + if (! $sortorder) + { + $out.= ''.img_down("A-Z",0).''; + $out.= ''.img_up("Z-A",0).''; + } + else + { + if ($field != $sortfield) + { + $out.= ''.img_down("A-Z",0).''; + $out.= ''.img_up("Z-A",0).''; + } + else { + $sortorder=strtoupper($sortorder); + if ($sortorder == 'DESC' ) { + $out.= ''.img_down("A-Z",0).''; + $out.= ''.img_up("Z-A",1).''; + } + if ($sortorder == 'ASC' ) { + $out.= ''.img_down("A-Z",1).''; + $out.= ''.img_up("Z-A",0).''; + } + } + } + } + $out.= ""; } - $out.=''; return $out; } @@ -2664,7 +2672,6 @@ function print_fiche_titre($titre, $mesg='', $picto='title.png', $pictoisfullpat /** * Load a title with picto - * * @param titre Title to show * @param mesg Added message to show on right * @param picto Icon to use before title (should be a 32x32 transparent png file) @@ -2697,7 +2704,6 @@ function load_fiche_titre($titre, $mesg='', $picto='title.png', $pictoisfullpath /** * Print a title with navigation controls for pagination - * * @param titre Title to show (required) * @param page Numero of page (required) * @param file Url of page (required) @@ -2807,7 +2813,6 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so /** * Fonction servant a afficher les fleches de navigation dans les pages de listes - * * @param page Numero of page * @param file Lien * @param options Autres parametres d'url a propager dans les liens ("" par defaut) @@ -2832,7 +2837,6 @@ function print_fleche_navigation($page,$file,$options='',$nextpage,$betweenarrow /** * Fonction qui retourne un taux de tva formate pour visualisation * Utilisee dans les pdf et les pages html - * * @param rate Rate value to format (19.6 19,6 19.6% 19,6%,...) * @param addpercent Add a percent % sign in output * @param info_bits Miscellanous information on vat @@ -2861,7 +2865,6 @@ function vatrate($rate,$addpercent=false,$info_bits=0) /** * Fonction qui formate un montant pour visualisation * Fonction utilisee dans les pdf et les pages html - * * @param amount Montant a formater * @param html Type de formatage, html ou pas (par defaut) * @param outlangs Objet langs pour formatage text @@ -2934,8 +2937,7 @@ function price($amount, $html=0, $outlangs='', $trunc=1, $rounding=-1, $forcerou /** * Function that return a number with universal decimal format (decimal separator is '.') from * an amount typed by a user. - * Function to use on each input amount before any numeric test or database insert - * + * Function to use on each input amount before any numeric test or database insert. * @param amount Amount to convert/clean * @param rounding ''=No rounding * 'MU'=Round to Max unit price (MAIN_MAX_DECIMALS_UNIT) @@ -3020,7 +3022,6 @@ function price2num($amount,$rounding='',$alreadysqlnb=0) /** * Return localtaxe rate for a particular tva - * * @param tva Vat taxe * @param local Local taxe to search and return * @param societe_acheteuse Object of buying third party @@ -3059,8 +3060,7 @@ function get_localtax($tva, $local, $societe_acheteuse="") /** * Return vat rate of a product in a particular selling country or default country - * vat if product is unknown - * + * vat if product is unknown. * @param idprod Id of product or 0 if not a predefined product * @param countrycode Country code (FR, US, IT, ...) * @return int <0 if KO, Vat rate if OK @@ -3119,7 +3119,6 @@ function get_product_vat_for_country($idprod, $countrycode) /** * Return localtax rate of a product in a particular selling country - * * @param idprod Id of product * @package local 1 for localtax1, 2 for localtax 2 * @param countrycode Country code (FR, US, IT, ...) @@ -3277,7 +3276,6 @@ function get_default_localtax($societe_vendeuse, $societe_acheteuse, $local, $id /** * Return yes or no in current language - * * @param yesno Value to test (1, 'yes', 'true' or 0, 'no', 'false') * @param case 1=Yes/No, 0=yes/no * @param color 0=texte only, 1=Text is formated with a color font style ('ok' or 'error'), 2=Text is formated with 'ok' color. @@ -3306,7 +3304,6 @@ function yn($yesno, $case=1, $color=0) * Return a path to have a directory according to an id * Examples: '001' with level 3->"0/0/1/", '015' with level 3->"0/1/5/" * Examples: 'ABC-1' with level 3 ->"0/0/1/", '015' with level 1->"5/" - * * @param $num Id to develop * @param $level Level of development (1, 2 or 3 level) * @param $alpha Use alpha ref @@ -3333,7 +3330,6 @@ function create_exdir($dir) /** * Creation of a directory (recursive) - * * @param $dir Directory to create * @return int < 0 if KO, 0 = already exists, > 0 if OK */ @@ -3395,7 +3391,6 @@ function dol_mkdir($dir) /** * Return picto saying a field is required - * * @return string Chaine avec picto obligatoire */ function picto_required() @@ -3406,7 +3401,6 @@ function picto_required() /** * Clean a string from all HTML tags and entities - * * @param StringHtml String to clean * @param removelinefeed Replace also all lines feeds by a space * @return string String cleaned @@ -3431,8 +3425,7 @@ function dol_string_nohtmltag($StringHtml,$removelinefeed=1) /** - * Replace CRLF in string with a HTML BR tag - * + * Replace CRLF in string with a HTML BR tag. * @param stringtoencode String to encode * @param nl2brmode 0=Adding br before \n, 1=Replacing \n by br * @param forxml false=Use
, true=Use
@@ -3462,8 +3455,7 @@ function dol_nl2br($stringtoencode,$nl2brmode=0,$forxml=false) * - writeHTMLCell -> param must be encoded into HTML. * - MultiCell -> param must not be encoded into HTML. * Because writeHTMLCell convert also \n into
, if function - * is used to build PDF, nl2brmode must be 1 - * + * is used to build PDF, nl2brmode must be 1. * @param stringtoencode String to encode * @param nl2brmode 0=Adding br before \n, 1=Replacing \n by br (for use with FPDF writeHTMLCell function for example) * @param pagecodefrom Pagecode stringtoencode is encoded @@ -3490,7 +3482,6 @@ function dol_htmlentitiesbr($stringtoencode,$nl2brmode=0,$pagecodefrom='UTF-8') /** * This function is called to decode a HTML string (it decodes entities and br tags) - * * @param stringtodecode String to decode * @param pagecodeto Page code for result */ @@ -3506,7 +3497,6 @@ function dol_htmlentitiesbr_decode($stringtodecode,$pagecodeto='UTF-8') /** * This function remove all ending \n and br at end - * * @param stringtodecode String to decode */ function dol_htmlcleanlastbr($stringtodecode) @@ -3517,7 +3507,6 @@ function dol_htmlcleanlastbr($stringtodecode) /** * This function is called to decode a string with HTML entities (it decodes entities tags) - * * @param stringhtml stringhtml * @param pagecodeto Encoding of input string * @return string decodestring @@ -3530,7 +3519,6 @@ function dol_entity_decode($stringhtml,$pagecodeto='UTF-8') /** * Replace html_entity_decode functions to manage errors - * * @param a * @param b * @param c @@ -3545,7 +3533,6 @@ function dol_html_entity_decode($a,$b,$c) /** * Replace htmlentities functions to manage errors - * * @param a * @param b * @param c @@ -3562,8 +3549,7 @@ function dol_htmlentities($a,$b,$c) /** * Check if a string is a correct iso string * If not, it will we considered not HTML encoded even if it is by FPDF. - * Example, if string contains euro symbol that has ascii code 128 - * + * Example, if string contains euro symbol that has ascii code 128. * @param s String to check * @return int 0 if bad iso, 1 if good iso */ @@ -3584,7 +3570,6 @@ function dol_string_is_good_iso($s) /** * Return nb of lines of a clear text - * * @param s String to check * @param maxchar Not yet used * @return int Number of lines @@ -3601,7 +3586,6 @@ function dol_nboflines($s,$maxchar=0) /** * Return nb of lines of a formated text with \n and
- * * @param text Text * @param maxlinesize Largeur de ligne en caracteres (ou 0 si pas de limite - defaut) * @param charset Give the charset used to encode the $text variable in memory. @@ -3638,7 +3622,6 @@ function dol_nboflines_bis($text,$maxlinesize=0,$charset='UTF-8') /** * Same function than microtime in PHP 5 but compatible with PHP4 - * * @return float Time (millisecondes) with microsecondes in decimal part */ function dol_microtime_float() @@ -3649,7 +3632,6 @@ function dol_microtime_float() /** * Return if a text is a html content - * * @param msg Content to check * @param option 0=Full detection, 1=Fast check * @return boolean true/false @@ -4112,8 +4094,7 @@ function verifCond($strRights) /** * Replace eval function to add more security. - * This function is called by verifCond() - * + * This function is called by verifCond(). * @param string $s */ function dol_eval($s) 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 4222a4dacab..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','',''); @@ -54,11 +50,11 @@ if (! $sortfield) $sortfield="c.name"; /* - * Actions + * Action */ // Add a notification -if ($action == 'add') +if ($_POST["action"] == 'add') { $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def"; $sql .= " WHERE fk_soc=".$socid." AND fk_contact=".$_POST["contactid"]." AND fk_action=".$_POST["actionid"]; @@ -83,7 +79,7 @@ if ($action == 'add') } // 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); @@ -100,9 +96,9 @@ $form = new Form($db); llxHeader(); $soc = new Societe($db); -$result=$soc->fetch($socid); +$soc->id = $socid; -if ($result > 0) +if ( $soc->fetch($soc->id) ) { $html = new Form($db); $langs->load("other"); @@ -165,12 +161,11 @@ if ($result > 0) 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 ''; $var=false; - $listofemails=$soc->thirdparty_and_contact_email_array(); - if (count($listofemails) > 0) + if (count($soc->thirdparty_and_contact_email_array()) > 0) { $actions=array(); @@ -185,7 +180,7 @@ if ($result > 0) } print ''; print ''; - print $html->selectarray("contactid",$listofemails); + print $html->selectarray("contactid",$soc->thirdparty_and_contact_email_array()); print ''; print ''; print $html->selectarray("actionid",$actions,'',1); @@ -350,7 +345,6 @@ if ($result > 0) 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..e8c7b805f8f 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -1200,68 +1200,64 @@ padding: 0px 0px; /* For lists */ table.liste { - width: 100%; - border-collapse: collapse; - border-top-color: #FEFEFE; +width: 100%; +border-collapse: collapse; +border-top-color: #FEFEFE; - border-left-width: 1px; - border-left-color: #BBBBBB; - border-left-style: solid; +border-left-width: 1px; +border-left-color: #BBBBBB; +border-left-style: solid; - border-right-width: 1px; - border-right-color: #BBBBBB; - border-right-style: solid; +border-right-width: 1px; +border-right-color: #BBBBBB; +border-right-style: solid; - border-bottom-width: 1px; - border-bottom-color: #BBBBBB; - border-bottom-style: solid; +border-bottom-width: 1px; +border-bottom-color: #BBBBBB; +border-bottom-style: solid; - margin-bottom: 2px; - margin-top: 0px; +margin-bottom: 2px; +margin-top: 0px; - -moz-box-shadow: 4px 4px 4px #CCC; - -webkit-box-shadow: 4px 4px 4px #CCC; - box-shadow: 4px 4px 4px #CCC; +-moz-box-shadow: 4px 4px 4px #CCC; +-webkit-box-shadow: 4px 4px 4px #CCC; +box-shadow: 4px 4px 4px #CCC; } table.liste td { - padding-right: 2px; +padding-right: 2px; } -tr.liste_titre -{ - height: 24px; - background: #7699A9; - background-image: url(); - background-repeat: repeat-x; - color: #FFFFFF; - font-family: ; - /* border-bottom: 1px solid #FDFFFF; */ - white-space: nowrap; +tr.liste_titre { +height: 24px; +background: #7699A9; +background-image: url(); +background-repeat: repeat-x; +color: #FFFFFF; +font-family: ; +/* border-bottom: 1px solid #FDFFFF; */ +white-space: nowrap; } -th.liste_titre, td.liste_titre -{ - background: #7699A9; - background-image: url(); - background-repeat: repeat-x; - color: #FFFFFF; - font-family: ; - font-weight: normal; - /* border-bottom: 1px solid #FDFFFF; */ - white-space: nowrap; - text-align: ; +td.liste_titre { +background: #7699A9; +background-image: url(); +background-repeat: repeat-x; +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: #7699A9; - background-image: url(); - background-repeat: repeat-x; - color: #FFFFFF; - font-family: ; - font-weight: normal; - /* text-decoration: underline; */ - /* border-bottom: 1px solid #FDFFFF; */ - white-space: nowrap; - text-align: ; +background: #7699A9; +background-image: url(); +background-repeat: repeat-x; +color: #FFFFFF; +font-family: ; +font-weight: normal; +/* text-decoration: underline; */ +/* border-bottom: 1px solid #FDFFFF; */ +white-space: nowrap; } input.liste_titre { background: transparent; @@ -1278,6 +1274,19 @@ font-weight: normal; white-space: nowrap; } +th { +/* background: #7699A9; */ +background: #91ABB3; +color: #334444; +font-family: ; +font-weight: bold; +border-left: 1px solid #FFFFFF; +border-right: 1px solid #FFFFFF; +border-top: 1px solid #FFFFFF; +border-bottom: 1px solid #FFFFFF; +white-space: nowrap; +} + .impair { /* background: #d0d4d7; */ background: #eaeaea; diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index 7312b757d11..4aa1e974344 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -1402,8 +1402,8 @@ tr.liste_titre:first-child { background-position: top right; } -th.liste_titre_sel, td.liste_titre_sel, -tr.liste_titre:first-child td { +td.liste_titre_sel, +tr.liste_titre:first-child td { color: #FFFFFF !important; } @@ -1430,8 +1430,7 @@ tr.liste_titre td { background: none !important; } -th.liste_titre, td.liste_titre -{ +td.liste_titre { background-repeat: repeat-x; color: #333333; font-family: ; @@ -1439,7 +1438,6 @@ th.liste_titre, td.liste_titre white-space: nowrap; background-image: none; background: none; - text-align: ; } /*tr.liste_titre select.flat { @@ -1455,8 +1453,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 +1462,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 { @@ -1485,6 +1481,19 @@ white-space: nowrap; padding: 5px; } +th { +/* background: #7699A9; */ +background: #91ABB3; +color: #334444; +font-family: ; +font-weight: bold; +border-left: 1px solid #FFFFFF; +border-right: 1px solid #FFFFFF; +border-top: 1px solid #FFFFFF; +border-bottom: 1px solid #FFFFFF; +white-space: nowrap; +} + .impair { /* background: #d0d4d7; */ background: #eaeaea; @@ -2212,7 +2221,7 @@ a.cke_dialog_ui_button margin-left: -240px; margin-bottom: 30px; } - + div#infoVersion { position: relative; width: 100%; @@ -2222,14 +2231,14 @@ div#infoVersion { font-size: 10px; background-color: #D6D6D6; } - + div#logoBox { position: relative; width: 100%; height: auto; margin-top: 30px; } - + div#parameterBox { position: relative; width: 100%; @@ -2240,14 +2249,14 @@ div#parameterBox { background-repeat: no-repeat; background-position: top center; } - + div#parameterBox div { width: 100%; height: 20px; position: relative; line-height: 20px; } - + div#parameterBox div label { width: 190px; text-align: right; @@ -2255,7 +2264,7 @@ div#parameterBox div label { float: left; margin-right: 10px; } - + div#parameterBox div input[type="text"], div#parameterBox div input[type="password"] { width: 180px; @@ -2263,12 +2272,12 @@ div#parameterBox div input[type="password"] { font-size: 10px; margin-top: 2px; } - + div#connectionLine { margin: 10px 0px; text-align: center; } - + div#logBox { margin-top: 25px; } @@ -2276,7 +2285,7 @@ margin-top: 25px; div.captchaBox { margin-top: 10px; } - + div.captchaImg { margin-bottom: 10px; margin-top: 5px; @@ -2286,7 +2295,7 @@ div.captchaImg { img#captcha { margin-left: 200px; } - + div#infoLogin { width: 100%; height: auto; @@ -2305,11 +2314,11 @@ div.other { left: 50%; margin-left: -240px; } - + form.listactionsfilter img { display: none; } - + form.listactionsfilter input[type="submit"] { margin: 2px 0px; } diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index 42f43efc8c8..4af783fde2d 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -1339,31 +1339,30 @@ table.liste td { } tr.liste_titre { - height: 20px; - color: #842F00; - font-weight: bold; - font-family: "Trebuchet MS",Arial,Helvetica,sans-serif; - /*border-bottom: 1px solid #FDFFFF;*/ - border-radius: 8px; - line-height: 18px; - padding-left: 10px; - padding-right: 10px; - white-space: nowrap; +height: 20px; +color: #842F00; +font-weight: bold; +font-family: "Trebuchet MS",Arial,Helvetica,sans-serif; +/*border-bottom: 1px solid #FDFFFF;*/ +border-radius: 8px; +line-height: 18px; +padding-left: 10px; +padding-right: 10px; +white-space: nowrap; } -th.liste_titre, td.liste_titre -{ + +tr.liste_titre td { padding-left: 6px; - padding-right: 6px; - /*vertical-align: text-top;*/ - text-align: ; + padding-right: 6px; + /*vertical-align: text-top;*/ } -th.liste_titre_sel, td.liste_titre_sel + +td.liste_titre_sel { - background-position: top right; - color: #A51B00; - font-weight: bold; - white-space: nowrap; - text-align: ; +background-position: top right; +color: #A51B00; +font-weight: bold; +white-space: nowrap; } input.liste_titre { @@ -1384,6 +1383,19 @@ font-weight: normal; white-space: nowrap; } +th { +/* background: #7699A9; */ +background: #91ABB3; +color: #334444; +font-family: ; +font-weight: bold; +border-left: 1px solid #FFFFFF; +border-right: 1px solid #FFFFFF; +border-top: 1px solid #FFFFFF; +border-bottom: 1px solid #FFFFFF; +white-space: nowrap; +} + .impair { /* background: #d0d4d7; */ background: #eaeaea; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 58e2ced4c1e..9de61eaaa77 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -228,12 +228,12 @@ div.fichecenter { div.fichethirdleft { browser->phone)) { print "float: ".$left.";\n"; } ?> browser->phone)) { print "width: 35%;\n"; } ?> - browser->phone)) { print "padding-bottom: 6px;\n"; } ?> + browser->phone)) { print "padding-bottom: 6px;\n"; } ?> } div.fichetwothirdright { browser->phone)) { print "float: ".$left.";\n"; } ?> browser->phone)) { print "width: 65%;\n"; } ?> - browser->phone)) { print "padding-bottom: 6px\n"; } ?> + browser->phone)) { print "padding-bottom: 6px\n"; } ?> } div.fichehalfleft { browser->phone)) { print "float: ".$left.";\n"; } ?> @@ -1222,63 +1222,59 @@ padding: 0px 0px; /* For lists */ table.liste { - width: 100%; - border-collapse: collapse; - border-top-color: #FEFEFE; +width: 100%; +border-collapse: collapse; +border-top-color: #FEFEFE; - border-right-width: 1px; - border-right-color: #BBBBBB; - border-right-style: solid; +border-right-width: 1px; +border-right-color: #BBBBBB; +border-right-style: solid; - border-bottom-width: 1px; - border-bottom-color: #BBBBBB; - border-bottom-style: solid; +border-bottom-width: 1px; +border-bottom-color: #BBBBBB; +border-bottom-style: solid; - margin-bottom: 2px; - margin-top: 0px; +margin-bottom: 2px; +margin-top: 0px; - -moz-box-shadow: 4px 4px 4px #CCC; - -webkit-box-shadow: 4px 4px 4px #CCC; - box-shadow: 4px 4px 4px #CCC; +-moz-box-shadow: 4px 4px 4px #CCC; +-webkit-box-shadow: 4px 4px 4px #CCC; +box-shadow: 4px 4px 4px #CCC; } table.liste td { - padding-right: 2px; +padding-right: 2px; } -tr.liste_titre -{ - height: 20px !important; - background: #7699A9; - background-image: url(); - background-repeat: repeat-x; - color: #334444; - font-family: ; - border-bottom: 1px solid #FDFFFF; - white-space: nowrap; +tr.liste_titre { +height: 20px !important; +background: #7699A9; +background-image: url(); +background-repeat: repeat-x; +color: #334444; +font-family: ; +border-bottom: 1px solid #FDFFFF; +white-space: nowrap; } -th.liste_titre, td.liste_titre -{ - background: #7699A9; - background-image: url(); - background-repeat: repeat-x; - color: #334444; - font-family: ; - font-weight: normal; - border-bottom: 1px solid #FDFFFF; - white-space: nowrap; - text-align: ; +td.liste_titre { +background: #7699A9; +background-image: url(); +background-repeat: repeat-x; +color: #334444; +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: #7699A9; - background-image: url(); - background-repeat: repeat-x; - color: #F5FFFF; - font-family: ; - font-weight: normal; - border-bottom: 1px solid #FDFFFF; - white-space: nowrap; - text-align: ; +background: #7699A9; +background-image: url(); +background-repeat: repeat-x; +color: #F5FFFF; +font-family: ; +font-weight: normal; +border-bottom: 1px solid #FDFFFF; +white-space: nowrap; } input.liste_titre { background: #7699A9; @@ -1296,6 +1292,18 @@ font-weight: normal; white-space: nowrap; } +th { +/* background: #7699A9; */ +background: #91ABB3; +color: #334444; +font-family: ; +font-weight: bold; +border-left: 1px solid #FFFFFF; +border-right: 1px solid #FFFFFF; +border-top: 1px solid #FFFFFF; +border-bottom: 1px solid #FFFFFF; +white-space: nowrap; +} .impair { /* background: #d0d4d7; */ 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;