alxarafe / alixar

Helpers/login/functions_openid.php

Spacing +16 added lines, -16 removed lines

@@ -34,13 +34,13 @@ 
  * @param   int		$entitytotest   Number of instance (always 1 if module multicompany not enabled)

  * @return	string					Login if OK, '' if KO

  */

-function check_user_password_openid($usertotest,$passwordtotest,$entitytotest)

+function check_user_password_openid($usertotest, $passwordtotest, $entitytotest)

 {

-    global $_POST,$db,$conf,$langs;

+    global $_POST, $db, $conf, $langs;

 

     dol_syslog("functions_openid::check_user_password_openid usertotest=".$usertotest);

 

-    $login='';

+    $login = '';

 

     // Get identity from user and redirect browser to OpenID Server

     if (isset($_POST['username']))

@@ -48,14 +48,14 @@ 
         $openid = new SimpleOpenID();

         $openid->SetIdentity($_POST['username']);

         $protocol = ($conf->file->main_force_https ? 'https://' : 'http://');

-        $openid->SetTrustRoot($protocol . $_SERVER["HTTP_HOST"]);

-        $openid->SetRequiredFields(array('email','fullname'));

+        $openid->SetTrustRoot($protocol.$_SERVER["HTTP_HOST"]);

+        $openid->SetRequiredFields(array('email', 'fullname'));

         $_SESSION['dol_entity'] = $_POST["entity"];

         //$openid->SetOptionalFields(array('dob','gender','postcode','country','language','timezone'));

         if ($openid->sendDiscoveryRequestToGetXRDS())

         {

-            $openid->SetApprovedURL($protocol . $_SERVER["HTTP_HOST"] . $_SERVER["SCRIPT_NAME"]);      // Send Response from OpenID server to this script

-            $openid->Redirect();     // This will redirect user to OpenID Server

+            $openid->SetApprovedURL($protocol.$_SERVER["HTTP_HOST"].$_SERVER["SCRIPT_NAME"]); // Send Response from OpenID server to this script

+            $openid->Redirect(); // This will redirect user to OpenID Server

         }

         else

         {

@@ -65,7 +65,7 @@ 
         return false;

     }

     // Perform HTTP Request to OpenID server to validate key

-    elseif($_GET['openid_mode'] == 'id_res')

+    elseif ($_GET['openid_mode'] == 'id_res')

     {

         $openid = new SimpleOpenID();

         $openid->SetIdentity($_GET['openid_identity']);

@@ -74,23 +74,23 @@ 
         {

             // OK HERE KEY IS VALID

 

-            $sql ="SELECT login";

-            $sql.=" FROM ".MAIN_DB_PREFIX."user";

-            $sql.=" WHERE openid = '".$db->escape($_GET['openid_identity'])."'";

-            $sql.=" AND entity IN (0," . ($_SESSION["dol_entity"] ? $_SESSION["dol_entity"] : 1) . ")";

+            $sql = "SELECT login";

+            $sql .= " FROM ".MAIN_DB_PREFIX."user";

+            $sql .= " WHERE openid = '".$db->escape($_GET['openid_identity'])."'";

+            $sql .= " AND entity IN (0,".($_SESSION["dol_entity"] ? $_SESSION["dol_entity"] : 1).")";

 

             dol_syslog("functions_openid::check_user_password_openid", LOG_DEBUG);

-            $resql=$db->query($sql);

+            $resql = $db->query($sql);

             if ($resql)

             {

-                $obj=$db->fetch_object($resql);

+                $obj = $db->fetch_object($resql);

                 if ($obj)

                 {

-                    $login=$obj->login;

+                    $login = $obj->login;

                 }

             }

         }

-        else if($openid->IsError() === true)

+        else if ($openid->IsError() === true)

         {

             // ON THE WAY, WE GOT SOME ERROR

             $error = $openid->GetError();

Braces +4 added lines, -8 removed lines

@@ -56,8 +56,7 @@ 
         {

             $openid->SetApprovedURL($protocol . $_SERVER["HTTP_HOST"] . $_SERVER["SCRIPT_NAME"]);      // Send Response from OpenID server to this script

             $openid->Redirect();     // This will redirect user to OpenID Server

-        }

-        else

+        } else

         {

             $error = $openid->GetError();

             return false;

@@ -89,21 +88,18 @@ 
                     $login=$obj->login;

                 }

             }

-        }

-        else if($openid->IsError() === true)

+        } else if($openid->IsError() === true)

         {

             // ON THE WAY, WE GOT SOME ERROR

             $error = $openid->GetError();

             return false;

-        }

-        else

+        } else

         {

             // Signature Verification Failed

             //echo "INVALID AUTHORIZATION";

             return false;

         }

-    }

-    else if ($_GET['openid_mode'] == 'cancel')

+    } else if ($_GET['openid_mode'] == 'cancel')

     {

         // User Canceled your Request

         //echo "USER CANCELED REQUEST";

Helpers/login/functions_empty.php

Indentation +5 added lines, -5 removed lines

@@ -33,12 +33,12 @@
  */

 function check_user_password_empty($usertotest,$passwordtotest,$entitytotest)

 {

-	global $langs;

+    global $langs;

 

-	dol_syslog("functions_empty::check_user_password_empty usertotest=".$usertotest);

+    dol_syslog("functions_empty::check_user_password_empty usertotest=".$usertotest);

 

-	$login='';

-	$_SESSION["dol_loginmesg"]=$langs->trans("FailedToLogin");

+    $login='';

+    $_SESSION["dol_loginmesg"]=$langs->trans("FailedToLogin");

 

-	return $login;

+    return $login;

 }

Spacing +3 added lines, -3 removed lines

@@ -31,14 +31,14 @@
  * @param   int		$entitytotest   Number of instance (always 1 if module multicompany not enabled)

  * @return	string					Login if OK, '' if KO

  */

-function check_user_password_empty($usertotest,$passwordtotest,$entitytotest)

+function check_user_password_empty($usertotest, $passwordtotest, $entitytotest)

 {

 	global $langs;

 

 	dol_syslog("functions_empty::check_user_password_empty usertotest=".$usertotest);

 

-	$login='';

-	$_SESSION["dol_loginmesg"]=$langs->trans("FailedToLogin");

+	$login = '';

+	$_SESSION["dol_loginmesg"] = $langs->trans("FailedToLogin");

 

 	return $login;

 }

Helpers/AlixarDispatcher.php

Spacing +12 added lines, -12 removed lines

@@ -12,7 +12,7 @@ 
 

     public function __construct()

     {

-        $this->searchDir[] = BASE_PATH . '/plugins';

+        $this->searchDir[] = BASE_PATH.'/plugins';

         $this->nameSpaces[] = 'Alixar';

 

         parent::__construct();

@@ -41,8 +41,8 @@ 
           define('SITE_URL', APP_PROTOCOL . '://' . SERVER_NAME);

           define('BASE_URI', SITE_URL . APP_URI);

          */

-        define('DOL_BASE_PATH', BASE_PATH . '/dolibarr/htdocs');

-        define('DOL_BASE_URI', BASE_URI . '/dolibarr/htdocs');

+        define('DOL_BASE_PATH', BASE_PATH.'/dolibarr/htdocs');

+        define('DOL_BASE_URI', BASE_URI.'/dolibarr/htdocs');

         define('DOL_DOCUMENT_ROOT', DOL_BASE_PATH);

 

         define('CORE_FOLDER', '/core');

@@ -56,15 +56,15 @@ 
         define('CACHE_FOLDER', '/../cache');

         //define('VENDOR_FOLDER', BASE_URI . '/vendor');

 

-        define('CORE_PATH', BASE_PATH . CORE_FOLDER);

-        define('CONFIG_PATH', BASE_PATH . CONFIG_FOLDER);

-        define('CONTROLLERS_PATH', BASE_PATH . CONTROLLERS_FOLDER);

-        define('HELPERS_PATH', BASE_PATH . HELPERS_FOLDER);

-        define('MODELS_PATH', BASE_PATH . MODELS_FOLDER);

-        define('SKINS_PATH', BASE_PATH . SKINS_FOLDER);

-        define('TEMPLATES_PATH', BASE_PATH . TEMPLATES_FOLDER);

-        define('PLUGINS_PATH', BASE_PATH . PLUGINS_FOLDER);

-        define('CACHE_PATH', BASE_PATH . CACHE_FOLDER);

+        define('CORE_PATH', BASE_PATH.CORE_FOLDER);

+        define('CONFIG_PATH', BASE_PATH.CONFIG_FOLDER);

+        define('CONTROLLERS_PATH', BASE_PATH.CONTROLLERS_FOLDER);

+        define('HELPERS_PATH', BASE_PATH.HELPERS_FOLDER);

+        define('MODELS_PATH', BASE_PATH.MODELS_FOLDER);

+        define('SKINS_PATH', BASE_PATH.SKINS_FOLDER);

+        define('TEMPLATES_PATH', BASE_PATH.TEMPLATES_FOLDER);

+        define('PLUGINS_PATH', BASE_PATH.PLUGINS_FOLDER);

+        define('CACHE_PATH', BASE_PATH.CACHE_FOLDER);

         //define('VENDOR_PATH', BASE_PATH . VENDOR_FOLDER);

 

         /**

Helpers/DolUtils.php

Indentation +93 added lines, -93 removed lines

@@ -258,7 +258,7 @@ 
      */

     static function dol_shutdown()

     {

-       // global Globals::$conf, $user, $langs, $db;

+        // global Globals::$conf, $user, $langs, $db;

         $disconnectdone = false;

         $depth = 0;

         if (is_object($db) && !empty($db->connected)) {

@@ -305,7 +305,7 @@ 
      */

     static function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $options = null, $noreplace = 0)

     {

-       // global $mysoc, $user, Globals::$conf;

+        // global $mysoc, $user, Globals::$conf;

 

         if (empty($paramname))

             return 'BadFirstParameterForDolUtils::GETPOST';

@@ -364,7 +364,7 @@ 
             elseif (!isset($_GET['sortfield'])) { // If we did a click on a field to sort, we do no apply default values. Same if option MAIN_ENABLE_DEFAULT_VALUES is not set

                 if (!empty($_GET['action']) && $_GET['action'] == 'create' && !isset($_GET[$paramname]) && !isset($_POST[$paramname])) {

                     // Search default value from $object->field

-                   // global $object;

+                    // global $object;

                     if (is_object($object) && isset($object->fields[$paramname]['default'])) {

                         $out = $object->fields[$paramname]['default'];

                     }

@@ -707,7 +707,7 @@ 
      */

     static function dol_include_once($relpath, $classname = '')

     {

-       // global Globals::$conf, $langs, $user, $mysoc;   // Do not remove this. They must be defined for files we include. Other globals var must be retreived with $GLOBALS['var']

+        // global Globals::$conf, $langs, $user, $mysoc;   // Do not remove this. They must be defined for files we include. Other globals var must be retreived with $GLOBALS['var']

 

         $fullpath = dol_buildpath($relpath);

 

@@ -735,7 +735,7 @@ 
      */

     static function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         $path = preg_replace('/^\//', '', $path);

 

@@ -777,7 +777,7 @@ 
             foreach (Globals::$conf->file->dol_document_root as $key => $dirroot) { // ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)

                 if ($key == 'main') {

                     if ($type == 3) {

-                       // global $dolibarr_main_url_root;

+                        // global $dolibarr_main_url_root;

                         // Define $urlwithroot

 

                         // $urlwithouturlroot = preg_replace('/' . preg_quote(DOL_BASE_URI, '/') . '$/i', '', trim($dolibarr_main_url_root));

@@ -801,7 +801,7 @@ 
                             $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : DOL_MAIN_URL_ROOT) . Globals::$conf->file->dol_url_root[$key] . '/' . $path;

                         }

                         if ($type == 3) {

-                           // global $dolibarr_main_url_root;

+                            // global $dolibarr_main_url_root;

                             // Define $urlwithroot

                             $urlwithouturlroot = preg_replace('/' . preg_quote(DOL_BASE_URI, '/') . '$/i', '', trim($dolibarr_main_url_root));

                             $urlwithroot = $urlwithouturlroot . DOL_BASE_URI;  // This is to use external domain name found into config file

@@ -1071,7 +1071,7 @@ 
      */

     static function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename = '', $restricttologhandler = '')

     {

-       // global Globals::$conf, $user;

+        // global Globals::$conf, $user;

 // If syslog module enabled

         if (empty(Globals::$conf->syslog->enabled))

             return;

@@ -1177,7 +1177,7 @@ 
      */

     static function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab = 0, $picto = '', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '')

     {

-       // global Globals::$conf, $langs, $hookmanager;

+        // global Globals::$conf, $langs, $hookmanager;

 

         $out = "\n" . '<div class="tabs" data-role="controlgroup" data-type="horizontal">' . "\n";

 

@@ -1360,7 +1360,7 @@ 
      */

     static function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldid = 'rowid', $fieldref = 'ref', $morehtmlref = '', $moreparam = '', $nodbprefix = 0, $morehtmlleft = '', $morehtmlstatus = '', $onlybanner = 0, $morehtmlright = '')

     {

-       // global Globals::$conf, $form, $user, $langs;

+        // global Globals::$conf, $form, $user, $langs;

 

         $error = 0;

 

@@ -1639,7 +1639,7 @@ 
      */

     static function fieldLabel($langkey, $fieldkey, $fieldrequired = 0)

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

         $ret = '';

         if ($fieldrequired)

             $ret .= '<span class="fieldrequired">';

@@ -1662,7 +1662,7 @@ 
      */

     static function dol_bc($var, $moreclass = '')

     {

-       // global $bc;

+        // global $bc;

         $ret = ' ' . $bc[$var];

         if ($moreclass)

             $ret = preg_replace('/class=\"/', 'class="' . $moreclass . ' ', $ret);

@@ -1682,7 +1682,7 @@ 
      */

     static function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs = '', $mode = 0)

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         $ret = '';

         $countriesusingstate = array('AU', 'CA', 'US', 'IN', 'GB', 'ES', 'UK', 'TR');    // See also MAIN_FORCE_STATE_INTO_ADDRESS

@@ -1773,7 +1773,7 @@ 
      */

     static function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlangs = '', $encodetooutput = false)

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 // Clean parameters

         $to_gmt = false;

         $offsettz = $offsetdst = 0;

@@ -1984,7 +1984,7 @@ 
      */

     static function dol_getdate($timestamp, $fast = false)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         $usealternatemethod = false;

         if ($timestamp <= 0)

@@ -2022,7 +2022,7 @@ 
      */

     static function dol_mktime($hour, $minute, $second, $month, $day, $year, $gm = false, $check = 1)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 //print "- ".$hour.",".$minute.",".$second.",".$month.",".$day.",".$year.",".$_SERVER["WINDIR"]." -";

 // Clean parameters

         if ($hour == -1 || empty($hour))

@@ -2134,7 +2134,7 @@ 
      */

     static function dol_print_size($size, $shortvalue = 0, $shortunit = 0)

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

         $level = 1024;

 

         if (!empty(Globals::$conf->dol_optimize_smallscreen))

@@ -2171,7 +2171,7 @@ 
      */

     static function dol_print_url($url, $target = '_blank', $max = 32, $withpicto = 0)

     {

-       // global $langs;

+        // global $langs;

 

         if (empty($url))

             return '';

@@ -2205,7 +2205,7 @@ 
      */

     static function dol_print_email($email, $cid = 0, $socid = 0, $addlink = 0, $max = 64, $showinvalid = 1, $withpicto = 0)

     {

-       // global Globals::$conf, $user, $langs, $hookmanager;

+        // global Globals::$conf, $user, $langs, $hookmanager;

 

         $newemail = $email;

 

@@ -2262,7 +2262,7 @@ 
      */

     static function dol_print_socialnetworks($value, $cid, $socid, $type)

     {

-       // global Globals::$conf, $user, $langs;

+        // global Globals::$conf, $user, $langs;

 

         $newskype = $value;

 

@@ -2317,7 +2317,7 @@ 
      */

     static function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addlink = '', $separ = "&nbsp;", $withpicto = '', $titlealt = '', $adddivfloat = 0)

     {

-       // global Globals::$conf, $user, $langs, $mysoc, $hookmanager;

+        // global Globals::$conf, $user, $langs, $mysoc, $hookmanager;

 // Clean phone parameter

         $phone = preg_replace("/[\s.-]/", "", trim($phone));

         if (empty($phone)) {

@@ -2581,7 +2581,7 @@ 
      */

     static function dol_print_ip($ip, $mode = 0)

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         $ret = '';

 

@@ -2626,7 +2626,7 @@ 
      */

     static function dolGetCountryCodeFromIp($ip)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         $countrycode = '';

 

@@ -2653,7 +2653,7 @@ 
      */

     static function dol_user_country()

     {

-       // global Globals::$conf, $langs, $user;

+        // global Globals::$conf, $langs, $user;

 //$ret=$user->xxx;

         $ret = '';

         if (!empty(Globals::$conf->geoipmaxmind->enabled)) {

@@ -2683,7 +2683,7 @@ 
      */

     static function dol_print_address($address, $htmlid, $mode, $id, $noprint = 0, $charfornl = '')

     {

-       // global Globals::$conf, $user, $langs, $hookmanager;

+        // global Globals::$conf, $user, $langs, $hookmanager;

 

         $out = '';

 

@@ -2815,7 +2815,7 @@ 
      */

     static function dol_substr($string, $start, $length, $stringencoding = '', $trunconbytes = 0)

     {

-       // global $langs;

+        // global $langs;

 

         if (empty($stringencoding))

             $stringencoding = $langs->charset_output;

@@ -2852,7 +2852,7 @@ 
      */

     static function dol_trunc($string, $size = 40, $trunc = 'right', $stringencoding = 'UTF-8', $nodot = 0, $display = 0)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         if ($size == 0 || !empty(Globals::$conf->global->MAIN_DISABLE_TRUNC))

             return $string;

@@ -2918,7 +2918,7 @@ 
      */

     static function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $srconly = 0, $notitle = 0, $alt = '', $morecss = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 // We forge fullpathpicto for image to $path/img/$picto. By default, we take DOL_BASE_URI/theme/$conf->theme/img/$picto

 //$url = DOL_BASE_URI;

         $url = DOL_BASE_URI;

@@ -3103,7 +3103,7 @@ 
      */

     static function img_weather($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         if (!preg_match('/(\.png|\.gif)$/i', $picto))

             $picto .= '.png';

@@ -3126,7 +3126,7 @@ 
      */

     static function img_picto_common($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         if (!preg_match('/(\.png|\.gif)$/i', $picto))

             $picto .= '.png';

@@ -3157,7 +3157,7 @@ 
      */

     static function img_action($titlealt, $numaction)

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if (empty($titlealt) || $titlealt == 'default') {

             if ($numaction == '-1' || $numaction == 'ST_NO') {

@@ -3195,7 +3195,7 @@ 
      */

     static function img_pdf($titlealt = 'default', $size = 3)

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Show');

@@ -3212,7 +3212,7 @@ 
      */

     static function img_edit_add($titlealt = 'default', $other = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Add');

@@ -3229,7 +3229,7 @@ 
      */

     static function img_edit_remove($titlealt = 'default', $other = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Remove');

@@ -3247,7 +3247,7 @@ 
      */

     static function img_edit($titlealt = 'default', $float = 0, $other = 'class="pictoedit"')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Modify');

@@ -3265,7 +3265,7 @@ 
      */

     static function img_view($titlealt = 'default', $float = 0, $other = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('View');

@@ -3284,7 +3284,7 @@ 
      */

     static function img_delete($titlealt = 'default', $other = 'class="pictodelete"')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Delete');

@@ -3302,7 +3302,7 @@ 
      */

     static function img_printer($titlealt = "default", $other = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

         if ($titlealt == "default")

             $titlealt = $langs->trans("Print");

         return img_picto($titlealt, 'printer.png', $other);

@@ -3317,7 +3317,7 @@ 
      */

     static function img_split($titlealt = 'default', $other = 'class="pictosplit"')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Split');

@@ -3334,7 +3334,7 @@ 
      */

     static function img_help($usehelpcursor = 1, $usealttitle = 1)

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($usealttitle) {

             if (is_string($usealttitle))

@@ -3354,7 +3354,7 @@ 
      */

     static function img_info($titlealt = 'default')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Informations');

@@ -3371,7 +3371,7 @@ 
      */

     static function img_warning($titlealt = 'default', $moreatt = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Warning');

@@ -3388,7 +3388,7 @@ 
      */

     static function img_error($titlealt = 'default')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Error');

@@ -3405,7 +3405,7 @@ 
      */

     static function img_next($titlealt = 'default', $moreatt = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Next');

@@ -3423,7 +3423,7 @@ 
      */

     static function img_previous($titlealt = 'default', $moreatt = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Previous');

@@ -3442,7 +3442,7 @@ 
      */

     static function img_down($titlealt = 'default', $selected = 0, $moreclass = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Down');

@@ -3460,7 +3460,7 @@ 
      */

     static function img_up($titlealt = 'default', $selected = 0, $moreclass = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Up');

@@ -3478,7 +3478,7 @@ 
      */

     static function img_left($titlealt = 'default', $selected = 0, $moreatt = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Left');

@@ -3496,7 +3496,7 @@ 
      */

     static function img_right($titlealt = 'default', $selected = 0, $moreatt = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Right');

@@ -3513,7 +3513,7 @@ 
      */

     static function img_allow($allow, $titlealt = 'default')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Active');

@@ -3588,7 +3588,7 @@ 
     {

         dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);

 

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Call');

@@ -3610,7 +3610,7 @@ 
      */

     static function img_search($titlealt = 'default', $other = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Search');

@@ -3632,7 +3632,7 @@ 
      */

     static function img_searchclear($titlealt = 'default', $other = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Search');

@@ -3657,7 +3657,7 @@ 
      */

     static function info_admin($text, $infoonimgalt = 0, $nodiv = 0, $admin = '1', $morecss = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($infoonimgalt) {

             return img_picto($text, 'info', 'class="hideonsmartphone' . ($morecss ? ' ' . $morecss : '') . '"');

@@ -3680,7 +3680,7 @@ 
      */

     static function dol_print_error($db = '', $error = '', $errors = null)

     {

-       // global Globals::$conf, $langs, $argv;

+        // global Globals::$conf, $langs, $argv;

         // global $dolibarr_main_prod;

 

         $out = '';

@@ -3799,7 +3799,7 @@ 
      */

     static function dol_print_error_email($prefixcode, $errormessage = '', $errormessages = array(), $morecss = 'error', $email = '')

     {

-       // global $langs, Globals::$conf;

+        // global $langs, Globals::$conf;

 

         if (empty($email))

             $email = Globals::$conf->global->MAIN_INFO_SOCIETE_MAIL;

@@ -3858,7 +3858,7 @@ 
      */

     static function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin = "", $moreparam = "", $moreattrib = "", $sortfield = "", $sortorder = "", $prefix = "", $disablesortlink = 0, $tooltip = '')

     {

-       // global Globals::$conf, $langs, $form;

+        // global Globals::$conf, $langs, $form;

 //print "$name, $file, $field, $begin, $options, $moreattrib, $sortfield, $sortorder<br>\n";

 

         $sortorder = strtoupper($sortorder);

@@ -3997,7 +3997,7 @@ 
      */

     static function load_fiche_titre($titre, $morehtmlright = '', $picto = 'title_generic.png', $pictoisfullpath = 0, $id = '', $morecssontable = '', $morehtmlcenter = '')

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         $return = '';

 

@@ -4047,7 +4047,7 @@ 
      */

     static function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '', $sortorder = '', $morehtmlcenter = '', $num = -1, $totalnboflines = '', $picto = 'title_generic.png', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '', $limit = -1, $hideselectlimit = 0, $hidenavigation = 0)

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         $savlimit = $limit;

         $savtotalnboflines = $totalnboflines;

@@ -4160,7 +4160,7 @@ 
      */

     static function print_fleche_navigation($page, $file, $options = '', $nextpage = 0, $betweenarrows = '', $afterarrows = '', $limit = -1, $totalnboflines = 0, $hideselectlimit = 0)

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         print '<div class="pagination"><ul>';

         if ((int) $limit >= 0 && empty($hideselectlimit)) {

@@ -4283,7 +4283,7 @@ 
      */

     static function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $forcerounding = -1, $currency_code = '')

     {

-       // global $langs, Globals::$conf;

+        // global $langs, Globals::$conf;

 // Clean parameters

         if (empty($amount))

             $amount = 0; // To have a numeric value if amount not defined or = ''

@@ -4376,7 +4376,7 @@ 
      */

     static function price2num($amount, $rounding = '', $alreadysqlnb = 0)

     {

-       // global $langs, Globals::$conf;

+        // global $langs, Globals::$conf;

 // Round PHP static function does not allow number like '1,234.56' nor '1.234,56' nor '1 234,56'

 // Numbers must be '1234.56'

 // Decimal delimiter for PHP and database SQL requests must be '.'

@@ -4499,7 +4499,7 @@ 
      */

     static function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_seller = "", $vatnpr = 0)

     {

-       // global $db, Globals::$conf, $mysoc;

+        // global $db, Globals::$conf, $mysoc;

 

         if (empty($thirdparty_seller) || !is_object($thirdparty_seller))

             $thirdparty_seller = $mysoc;

@@ -4639,7 +4639,7 @@ 
      */

     static function get_localtax_by_third($local)

     {

-       // global $db, $mysoc;

+        // global $db, $mysoc;

         $sql = "SELECT t.localtax1, t.localtax2 ";

         $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t inner join " . MAIN_DB_PREFIX . "c_country as c ON c.rowid=t.fk_pays";

         $sql .= " WHERE c.code = '" . $mysoc->country_code . "' AND t.active = 1 AND t.taux=(";

@@ -4672,7 +4672,7 @@ 
      */

     static function getTaxesFromId($vatrate, $buyer = null, $seller = null, $firstparamisid = 1)

     {

-       // global $db, $mysoc;

+        // global $db, $mysoc;

 

         dol_syslog("getTaxesFromId vat id or rate = " . $vatrate);

 

@@ -4729,7 +4729,7 @@ 
      */

     static function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisid = 0)

     {

-       // global $db, $mysoc;

+        // global $db, $mysoc;

 

         dol_syslog("getLocalTaxesFromRate vatrate=" . $vatrate . " local=" . $local);

 

@@ -4783,7 +4783,7 @@ 
      */

     static function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice = 0)

     {

-       // global $db, Globals::$conf, $mysoc;

+        // global $db, Globals::$conf, $mysoc;

 

         require_once DOL_BASE_PATH . '/product/class/product.class.php';

 

@@ -4854,7 +4854,7 @@ 
      */

     static function get_product_localtax_for_country($idprod, $local, $thirdparty_seller)

     {

-       // global $db, $mysoc;

+        // global $db, $mysoc;

 

         if (!class_exists('Product')) {

             require_once DOL_BASE_PATH . 'product/class/product.class.php';

@@ -4922,7 +4922,7 @@ 
      */

     static function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer, $idprod = 0, $idprodfournprice = 0)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         require_once DOL_BASE_PATH . '/core/lib/company.lib.php';

 

@@ -4997,7 +4997,7 @@ 
      */

     static function get_default_npr(Societe $thirdparty_seller, Societe $thirdparty_buyer, $idprod = 0, $idprodfournprice = 0)

     {

-       // global $db;

+        // global $db;

 

         if ($idprodfournprice > 0) {

             if (!class_exists('ProductFournisseur'))

@@ -5032,7 +5032,7 @@ 
      */

     static function get_default_localtax($thirdparty_seller, $thirdparty_buyer, $local, $idprod = 0)

     {

-       // global $mysoc;

+        // global $mysoc;

 

         if (!is_object($thirdparty_seller))

             return -1;

@@ -5077,7 +5077,7 @@ 
      */

     static function yn($yesno, $case = 1, $color = 0)

     {

-       // global $langs;

+        // global $langs;

         $result = 'unknown';

         $classname = '';

         if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') {  // A mettre avant test sur no a cause du == 0

@@ -5127,7 +5127,7 @@ 
      */

     static function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         $path = '';

 

@@ -5175,7 +5175,7 @@ 
      */

     static function dol_mkdir($dir, $dataroot = '', $newmask = null)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         dol_syslog("functions.lib::dol_mkdir: dir=" . $dir, LOG_INFO);

 

@@ -5722,7 +5722,7 @@ 
      */

     static function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null, $object = null)

     {

-       // global $db, Globals::$conf, $mysoc, $user, $extrafields;

+        // global $db, Globals::$conf, $mysoc, $user, $extrafields;

 

         $substitutionarray = array();

 

@@ -6028,7 +6028,7 @@ 
      */

     static function make_substitutions($text, $substitutionarray, $outputlangs = null)

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if (!is_array($substitutionarray))

             return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';

@@ -6094,7 +6094,7 @@ 
      */

     static function complete_substitutions_array(&$substitutionarray, $outputlangs, $object = null, $parameters = null, $callfunc = "completesubstitutionarray")

     {

-       // global Globals::$conf, $user;

+        // global Globals::$conf, $user;

 

         require_once DOL_BASE_PATH . '/core/lib/files.lib.php';

 

@@ -6164,7 +6164,7 @@ 
      */

     static function get_date_range($date_start, $date_end, $format = '', $outputlangs = '', $withparenthesis = 1)

     {

-       // global $langs;

+        // global $langs;

 

         $out = '';

 

@@ -6194,7 +6194,7 @@ 
      */

     static function dolGetFirstLastname($firstname, $lastname, $nameorder = -1)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         $ret = '';

 // If order not defined, we use the setup

@@ -6318,7 +6318,7 @@ 
      */

     static function get_htmloutput_mesg($mesgstring = '', $mesgarray = '', $style = 'ok', $keepembedded = 0)

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         $ret = 0;

         $return = '';

@@ -6554,7 +6554,7 @@ 
      */

     function dol_osencode($str)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         $tmp = ini_get("unicode.filesystem_encoding");      // Disponible avec PHP 6.0

         if (empty($tmp) && !empty($_SERVER["WINDIR"]))

@@ -6584,7 +6584,7 @@ 
      */

     static function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid = 'id', $entityfilter = 0)

     {

-       // global $cache_codes;

+        // global $cache_codes;

 // If key empty

         if ($key == '')

             return '';

@@ -6625,7 +6625,7 @@ 
      */

     static function verifCond($strRights)

     {

-       // global $user, Globals::$conf, $langs;

+        // global $user, Globals::$conf, $langs;

         // global $leftmenu;

         // global $rights;    // To export to dol_eval function

 //print $strRights."<br>\n";

@@ -6691,7 +6691,7 @@ 
      */

     static function picto_from_langcode($codelang, $moreatt = '')

     {

-       // global $langs;

+        // global $langs;

 

         if (empty($codelang))

             return '';

@@ -6726,7 +6726,7 @@ 
      */

     static function getLanguageCodeFromCountryCode($countrycode)

     {

-       // global $mysoc;

+        // global $mysoc;

 

         if (strtoupper($countrycode) == 'MQ')

             return 'fr_CA';

@@ -6960,7 +6960,7 @@ 
      */

     static function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type, $mode = 'add')

     {

-       // global $hookmanager;

+        // global $hookmanager;

 

         if (isset(Globals::$conf->modules_parts['tabs'][$type]) && is_array(Globals::$conf->modules_parts['tabs'][$type])) {

             foreach (Globals::$conf->modules_parts['tabs'][$type] as $value) {

@@ -7049,7 +7049,7 @@ 
      */

     static function printCommonFooter($zone = 'private')

     {

-       // global Globals::$conf, $hookmanager, $user;

+        // global Globals::$conf, $hookmanager, $user;

         // global $action;

         // global $micro_start_time;

 

@@ -7289,7 +7289,7 @@ 
      */

     static function natural_search($fields, $value, $mode = 0, $nofirstand = 0)

     {

-       // global $db, $langs;

+        // global $db, $langs;

 

         $value = trim($value);

 

@@ -7422,7 +7422,7 @@ 
      */

     static function showDirectDownloadLink($object)

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         $out = '';

         $url = $object->getLastMainDocLink($object->element);

@@ -7484,7 +7484,7 @@ 
      */

     static function getAdvancedPreviewUrl($modulepart, $relativepath, $alldata = 0, $param = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if (empty(Globals::$conf->use_javascript_ajax))

             return '';

@@ -7517,7 +7517,7 @@ 
      */

     static function ajax_autoselect($htmlname, $addlink = '')

     {

-       // global $langs;

+        // global $langs;

         $out = '<script type="text/javascript">

                jQuery(document).ready(static function () {

 				    jQuery("#' . $htmlname . '").click(function() { jQuery(this).select(); } );

@@ -7901,7 +7901,7 @@ 
      */

     static function getDictvalue($tablename, $field, $id, $checkentity = false, $rowidfield = 'rowid')

     {

-       // global $dictvalues, $db, $langs;

+        // global $dictvalues, $db, $langs;

 

         if (!isset($dictvalues[$tablename])) {

             $dictvalues[$tablename] = array();

@@ -7969,7 +7969,7 @@ 
      */

     static function isVisibleToUserType($type_user, &$menuentry, &$listofmodulesforexternal)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 //print 'type_user='.$type_user.' module='.$menuentry['module'].' enabled='.$menuentry['enabled'].' perms='.$menuentry['perms'];

 //print 'ok='.in_array($menuentry['module'], $listofmodulesforexternal);

         if (empty($menuentry['enabled']))

Spacing +542 added lines, -542 removed lines

@@ -52,7 +52,7 @@ 
      */

     static function getStaticMember($class, $member)

     {

-        dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);

+        dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);

 

         // This part is deprecated. Uncomment if for php 5.2.*, and comment next isset class::member

         /* if (version_compare(phpversion(), '5.3.0', '<'))

@@ -77,7 +77,7 @@ 
 

         if (isset($class::$member))

             return $class::$member;

-        dol_print_error('', 'Try to get a static member "' . $member . '" in class "' . $class . '" that does not exists or is not static.');

+        dol_print_error('', 'Try to get a static member "'.$member.'" in class "'.$class.'" that does not exists or is not static.');

         return null;

     }

 

@@ -94,9 +94,9 @@ 
      */

     static function getDoliDBInstance($type, $host, $user, $pass, $name, $port)

     {

-        require_once DOL_BASE_PATH . "/core/db/" . $type . '.class.php';

+        require_once DOL_BASE_PATH."/core/db/".$type.'.class.php';

 

-        $class = 'DoliDB' . ucfirst($type);

+        $class = 'DoliDB'.ucfirst($type);

         $dolidb = new $class($type, $host, $user, $pass, $name, $port);

         return $dolidb;

     }

@@ -265,7 +265,7 @@ 
             $depth = $db->transaction_opened;

             $disconnectdone = $db->close();

         }

-        dol_syslog("--- End access to " . $_SERVER["PHP_SELF"] . (($disconnectdone && $depth) ? ' (Warn: db disconnection forced, transaction depth was ' . $depth . ')' : ''), (($disconnectdone && $depth) ? LOG_WARNING : LOG_INFO));

+        dol_syslog("--- End access to ".$_SERVER["PHP_SELF"].(($disconnectdone && $depth) ? ' (Warn: db disconnection forced, transaction depth was '.$depth.')' : ''), (($disconnectdone && $depth) ? LOG_WARNING : LOG_INFO));

     }

 

     /**

@@ -310,7 +310,7 @@ 
         if (empty($paramname))

             return 'BadFirstParameterForDolUtils::GETPOST';

         if (empty($check)) {

-            dol_syslog("Deprecated use of DolUtils::GETPOST, called with 1st param = " . $paramname . " and 2nd param is '', when calling page " . $_SERVER["PHP_SELF"], LOG_WARNING);

+            dol_syslog("Deprecated use of DolUtils::GETPOST, called with 1st param = ".$paramname." and 2nd param is '', when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);

         // Enable this line to know who call the DolUtils::GETPOST with '' $check parameter.

         //var_dump(debug_backtrace()[0]);

         }

@@ -332,7 +332,7 @@ 
             $relativepathstring = $_SERVER["PHP_SELF"];

             // Clean $relativepathstring

             if (constant('DOL_BASE_URI'))

-                $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);

+                $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_BASE_URI'), '/').'/', '', $relativepathstring);

             $relativepathstring = preg_replace('/^\//', '', $relativepathstring);

             $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);

             //var_dump($relativepathstring);

@@ -340,8 +340,8 @@ 
             // Code for search criteria persistence.

             // Retrieve values if restore_lastsearch_values

             if (!empty($_GET['restore_lastsearch_values'])) {        // Use $_GET here and not DolUtils::GETPOST

-                if (!empty($_SESSION['lastsearch_values_' . $relativepathstring])) { // If there is saved values

-                    $tmp = json_decode($_SESSION['lastsearch_values_' . $relativepathstring], true);

+                if (!empty($_SESSION['lastsearch_values_'.$relativepathstring])) { // If there is saved values

+                    $tmp = json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true);

                     if (is_array($tmp)) {

                         foreach ($tmp as $key => $val) {

                             if ($key == $paramname) { // We are on the requested parameter

@@ -352,12 +352,12 @@ 
                     }

                 }

                 // If there is saved contextpage, page or limit

-                if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_' . $relativepathstring])) {

-                    $out = $_SESSION['lastsearch_contextpage_' . $relativepathstring];

-                } elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_' . $relativepathstring])) {

-                    $out = $_SESSION['lastsearch_page_' . $relativepathstring];

-                } elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_' . $relativepathstring])) {

-                    $out = $_SESSION['lastsearch_limit_' . $relativepathstring];

+                if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_'.$relativepathstring])) {

+                    $out = $_SESSION['lastsearch_contextpage_'.$relativepathstring];

+                } elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring])) {

+                    $out = $_SESSION['lastsearch_page_'.$relativepathstring];

+                } elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring])) {

+                    $out = $_SESSION['lastsearch_limit_'.$relativepathstring];

                 }

             }

             // Else, retreive default values if we are not doing a sort

@@ -425,7 +425,7 @@ 
                                             $qualified = 1;

 

                                         if ($qualified) {

-                                            $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "=");  // we accept _, -, . and ,

+                                            $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,

                                             foreach ($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val) {

                                                 if ($out)

                                                     $out .= ', ';

@@ -461,11 +461,11 @@ 
                                         if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all'])) {

                                             // We made a search from quick search menu, do we still use default filter ?

                                             if (empty(Globals::$conf->global->MAIN_DISABLE_DEFAULT_FILTER_FOR_QUICK_SEARCH)) {

-                                                $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "=");  // we accept _, -, . and ,

+                                                $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,

                                                 $out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);

                                             }

                                         } else {

-                                            $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "=");  // we accept _, -, . and ,

+                                            $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,

                                             $out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);

                                         }

                                         break;

@@ -483,7 +483,7 @@ 
         // We do this only if var is a GET. If it is a POST, may be we want to post the text with vars as the setup text.

         if (!is_array($out) && empty($_POST[$paramname]) && empty($noreplace)) {

             $maxloop = 20;

-            $loopnb = 0;    // Protection against infinite loop

+            $loopnb = 0; // Protection against infinite loop

             while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop)) {    // Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'. Detection is also correct when 2 vars are side by side.

                 $loopnb++;

                 $newout = '';

@@ -528,7 +528,7 @@ 
                 } elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID') {

                     $newout = Globals::$conf->entity;

                 } else

-                    $newout = '';     // Key not found, we replace with empty string

+                    $newout = ''; // Key not found, we replace with empty string

 

 

 

@@ -563,7 +563,7 @@ 
 

                     

 //var_dump('__'.$reg[1].'__ -> '.$newout);

-                $out = preg_replace('/__' . preg_quote($reg[1], '/') . '__/', $newout, $out);

+                $out = preg_replace('/__'.preg_quote($reg[1], '/').'__/', $newout, $out);

             }

         }

 

@@ -673,7 +673,7 @@ 
         // If prefix is for email

         if ($mode == 'email') {

             if (empty(Globals::$conf->global->MAIL_PREFIX_FOR_EMAIL_ID)) {

-                return Security::dol_hash(DOL_DOCUMENT_ROOT . DOL_BASE_URI);

+                return Security::dol_hash(DOL_DOCUMENT_ROOT.DOL_BASE_URI);

             }

             // If MAIL_PREFIX_FOR_EMAIL_ID is set (a value initialized with a random value is recommended)

             if (Globals::$conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') {

@@ -683,16 +683,16 @@ 
                 return $_SERVER["SERVER_NAME"];

             }

 

-            return Security::dol_hash(DOL_DOCUMENT_ROOT . DOL_BASE_URI);

+            return Security::dol_hash(DOL_DOCUMENT_ROOT.DOL_BASE_URI);

         }

 

         if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"])) {

-            return Security::dol_hash($_SERVER["SERVER_NAME"] . $_SERVER["DOCUMENT_ROOT"] . DOL_DOCUMENT_ROOT . DOL_BASE_URI);

+            return Security::dol_hash($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_BASE_URI);

 

             // Use this for a "readable" cookie name

             //return dol_sanitizeFileName($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_BASE_URI);

         }

-        return Security::dol_hash(DOL_DOCUMENT_ROOT . DOL_BASE_URI);

+        return Security::dol_hash(DOL_DOCUMENT_ROOT.DOL_BASE_URI);

     }

 

     /**

@@ -712,7 +712,7 @@ 
         $fullpath = dol_buildpath($relpath);

 

         if (!file_exists($fullpath)) {

-            dol_syslog('functions::dol_include_once Tried to load unexisting file: ' . $relpath, LOG_ERR);

+            dol_syslog('functions::dol_include_once Tried to load unexisting file: '.$relpath, LOG_ERR);

             return false;

         }

 

@@ -741,14 +741,14 @@ 
 

         if ($type == 0 /* empty($type) */) { // For a filesystem path

 //$res = DOL_BASE_PATH . '' . $path;  // Standard default path

-            $res = DOL_BASE_PATH . '/' . $path;  // Standard default path

+            $res = DOL_BASE_PATH.'/'.$path; // Standard default path

             if (isset(Globals::$conf->file->dol_document_root)) {

                 foreach (Globals::$conf->file->dol_document_root as $key => $dirroot) { // ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)

                     if ($key == 'main') {

                         continue;

                     }

-                    if (file_exists($dirroot . '/' . $path)) {

-                        $res = $dirroot . '/' . $path;

+                    if (file_exists($dirroot.'/'.$path)) {

+                        $res = $dirroot.'/'.$path;

                         return $res;

                     }

                 }

@@ -765,13 +765,13 @@ 
 // using proxy, rewriting, virtual path, etc...

             $res = '';

             if ($type == 1) {

-                $res = /* DOL_BASE_URI */ DOL_BASE_URI . '/' . $path;   // Standard value

+                $res = /* DOL_BASE_URI */ DOL_BASE_URI.'/'.$path; // Standard value

             }

             if ($type == 2) {

-                $res = /* DOL_MAIN_URL_ROOT */ DOL_BASE_PATH . '/' . $path;  // Standard value

+                $res = /* DOL_MAIN_URL_ROOT */ DOL_BASE_PATH.'/'.$path; // Standard value

             }

             if ($type == 3) {

-                $res = DOL_BASE_URI . '/' . $path;

+                $res = DOL_BASE_URI.'/'.$path;

             }

 

             foreach (Globals::$conf->file->dol_document_root as $key => $dirroot) { // ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)

@@ -781,33 +781,33 @@ 
                         // Define $urlwithroot

 

                         // $urlwithouturlroot = preg_replace('/' . preg_quote(DOL_BASE_URI, '/') . '$/i', '', trim($dolibarr_main_url_root));

-                        $urlwithouturlroot = preg_replace('/' . preg_quote(DOL_BASE_URI, '/') . '$/i', '', trim(DOL_BASE_URI));

+                        $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_BASE_URI, '/').'$/i', '', trim(DOL_BASE_URI));

 

-                        $urlwithroot = $urlwithouturlroot . DOL_BASE_URI;  // This is to use external domain name found into config file

+                        $urlwithroot = $urlwithouturlroot.DOL_BASE_URI; // This is to use external domain name found into config file

                         //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current

 

-                        $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : $urlwithroot) . '/' . $path;     // Test on start with http is for old conf syntax

+                        $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : $urlwithroot).'/'.$path; // Test on start with http is for old conf syntax

                     }

                     continue;

                 }

-                preg_match('/^([^\?]+(\.css\.php|\.css|\.js\.php|\.js|\.png|\.jpg|\.php)?)/i', $path, $regs);    // Take part before '?'

+                preg_match('/^([^\?]+(\.css\.php|\.css|\.js\.php|\.js|\.png|\.jpg|\.php)?)/i', $path, $regs); // Take part before '?'

                 if (!empty($regs[1])) {

                     //print $key.'-'.$dirroot.'/'.$path.'-'.$conf->file->dol_url_root[$type].'<br>'."\n";

-                    if (file_exists($dirroot . '/' . $regs[1])) {

+                    if (file_exists($dirroot.'/'.$regs[1])) {

                         if ($type == 1) {

-                            $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : DOL_BASE_URI) . Globals::$conf->file->dol_url_root[$key] . '/' . $path;

+                            $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : DOL_BASE_URI).Globals::$conf->file->dol_url_root[$key].'/'.$path;

                         }

                         if ($type == 2) {

-                            $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : DOL_MAIN_URL_ROOT) . Globals::$conf->file->dol_url_root[$key] . '/' . $path;

+                            $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : DOL_MAIN_URL_ROOT).Globals::$conf->file->dol_url_root[$key].'/'.$path;

                         }

                         if ($type == 3) {

                            // global $dolibarr_main_url_root;

                             // Define $urlwithroot

-                            $urlwithouturlroot = preg_replace('/' . preg_quote(DOL_BASE_URI, '/') . '$/i', '', trim($dolibarr_main_url_root));

-                            $urlwithroot = $urlwithouturlroot . DOL_BASE_URI;  // This is to use external domain name found into config file

+                            $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_BASE_URI, '/').'$/i', '', trim($dolibarr_main_url_root));

+                            $urlwithroot = $urlwithouturlroot.DOL_BASE_URI; // This is to use external domain name found into config file

                             //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current

 

-                            $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : $urlwithroot) . Globals::$conf->file->dol_url_root[$key] . '/' . $path;     // Test on start with http is for old conf syntax

+                            $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : $urlwithroot).Globals::$conf->file->dol_url_root[$key].'/'.$path; // Test on start with http is for old conf syntax

                         }

                         break;

                     }

@@ -835,7 +835,7 @@ 
         if (empty($native)) {

             $myclone = unserialize(serialize($object));

         } else {

-            $myclone = clone $object;     // PHP clone is a shallow copy only, not a real clone, so properties of references will keep references (refer to the same target/variable)

+            $myclone = clone $object; // PHP clone is a shallow copy only, not a real clone, so properties of references will keep references (refer to the same target/variable)

         }

 

         return $myclone;

@@ -956,7 +956,7 @@ 
      */

     static function dol_string_nospecial($str, $newstr = '_', $badcharstoreplace = '')

     {

-        $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°');  // more complete than dol_sanitizeFileName

+        $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°'); // more complete than dol_sanitizeFileName

         $forbidden_chars_to_remove = array();

         if (is_array($badcharstoreplace))

             $forbidden_chars_to_replace = $badcharstoreplace;

@@ -1019,12 +1019,12 @@ 
     static function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0)

     {

 // escape quotes and backslashes, newlines, etc.

-        $tmp = html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8');  // TODO Use htmlspecialchars_decode instead, that make only required change for html tags

+        $tmp = html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8'); // TODO Use htmlspecialchars_decode instead, that make only required change for html tags

         if (!$keepb)

             $tmp = strtr($tmp, array("<b>" => '', '</b>' => ''));

         if (!$keepn)

             $tmp = strtr($tmp, array("\r" => '\\r', "\n" => '\\n'));

-        return htmlentities($tmp, ENT_COMPAT, 'UTF-8');      // TODO Use htmlspecialchars instead, that make only required change for html tags

+        return htmlentities($tmp, ENT_COMPAT, 'UTF-8'); // TODO Use htmlspecialchars instead, that make only required change for html tags

     }

 

     /**

@@ -1094,14 +1094,14 @@ 
             $message = preg_replace('/password=\'[^\']*\'/', 'password=\'hidden\'', $message); // protection to avoid to have value of password in log

 // If adding log inside HTML page is required

             if (!empty($_REQUEST['logtohtml']) && (!empty(Globals::$conf->global->MAIN_ENABLE_LOG_TO_HTML) || !empty(Globals::$conf->global->MAIN_LOGTOHTML))) {   // MAIN_LOGTOHTML kept for backward compatibility

-                Globals::$conf->logbuffer[] = dol_print_date(time(), "%Y-%m-%d %H:%M:%S") . " " . $message;

+                Globals::$conf->logbuffer[] = dol_print_date(time(), "%Y-%m-%d %H:%M:%S")." ".$message;

             }

 

 //TODO: Remove this. MAIN_ENABLE_LOG_INLINE_HTML should be deprecated and use a log handler dedicated to HTML output

 // If html log tag enabled and url parameter log defined, we show output log on HTML comments

             if (!empty(Globals::$conf->global->MAIN_ENABLE_LOG_INLINE_HTML) && !empty($_GET["log"])) {

                 print "\n\n<!-- Log start\n";

-                print $message . "\n";

+                print $message."\n";

                 print "Log end -->\n";

             }

 

@@ -1115,7 +1115,7 @@ 
 

 // This is when server run behind a reverse proxy

             if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']))

-                $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'] . (empty($_SERVER["REMOTE_ADDR"]) ? '' : '->' . $_SERVER['REMOTE_ADDR']);

+                $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'].(empty($_SERVER["REMOTE_ADDR"]) ? '' : '->'.$_SERVER['REMOTE_ADDR']);

 // This is when server run normally on a server

             else if (!empty($_SERVER["REMOTE_ADDR"]))

                 $data['ip'] = $_SERVER['REMOTE_ADDR'];

@@ -1124,10 +1124,10 @@ 
                 $data['ip'] = $_SERVER['SERVER_ADDR'];

 // This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).

             else if (!empty($_SERVER['COMPUTERNAME']))

-                $data['ip'] = $_SERVER['COMPUTERNAME'] . (empty($_SERVER['USERNAME']) ? '' : '@' . $_SERVER['USERNAME']);

+                $data['ip'] = $_SERVER['COMPUTERNAME'].(empty($_SERVER['USERNAME']) ? '' : '@'.$_SERVER['USERNAME']);

 // This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it).

             else if (!empty($_SERVER['LOGNAME']))

-                $data['ip'] = '???@' . $_SERVER['LOGNAME'];

+                $data['ip'] = '???@'.$_SERVER['LOGNAME'];

 // Loop on each log handler and send output

             foreach (Globals::$conf->loghandlers as $loghandlerinstance) {

                 if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler)

@@ -1179,10 +1179,10 @@ 
     {

        // global Globals::$conf, $langs, $hookmanager;

 

-        $out = "\n" . '<div class="tabs" data-role="controlgroup" data-type="horizontal">' . "\n";

+        $out = "\n".'<div class="tabs" data-role="controlgroup" data-type="horizontal">'."\n";

 

         if ($morehtmlright) {

-            $out .= '<div class="inline-block floatright tabsElem">' . $morehtmlright . '</div>'; // Output right area first so when space is missing, text is in front of tabs and not under.

+            $out .= '<div class="inline-block floatright tabsElem">'.$morehtmlright.'</div>'; // Output right area first so when space is missing, text is in front of tabs and not under.

         }

 

 // Show title

@@ -1193,8 +1193,8 @@ 
             $limittitle = 30;

             $out .= '<a class="tabTitle">';

             if ($picto)

-                $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_') . $picto, '', $pictoisfullpath) . ' ';

-            $out .= '<span class="tabTitleText">' . dol_trunc($title, $limittitle) . '</span>';

+                $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_').$picto, '', $pictoisfullpath).' ';

+            $out .= '<span class="tabTitleText">'.dol_trunc($title, $limittitle).'</span>';

             $out .= '</a>';

         }

 

@@ -1234,23 +1234,23 @@ 
             }

 

             if ($i < $limittoshow || $isactive) {

-                $out .= '<div class="inline-block tabsElem' . ($isactive ? ' tabsElemActive' : '') . ((!$isactive && !empty(Globals::$conf->global->MAIN_HIDE_INACTIVETAB_ON_PRINT)) ? ' hideonprint' : '') . '"><!-- id tab = ' . (empty($links[$i][2]) ? '' : $links[$i][2]) . ' -->';

+                $out .= '<div class="inline-block tabsElem'.($isactive ? ' tabsElemActive' : '').((!$isactive && !empty(Globals::$conf->global->MAIN_HIDE_INACTIVETAB_ON_PRINT)) ? ' hideonprint' : '').'"><!-- id tab = '.(empty($links[$i][2]) ? '' : $links[$i][2]).' -->';

                 if (isset($links[$i][2]) && $links[$i][2] == 'image') {

                     if (!empty($links[$i][0])) {

-                        $out .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n";

+                        $out .= '<a class="tabimage'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";

                     } else {

-                        $out .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n";

+                        $out .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";

                     }

                 } else if (!empty($links[$i][1])) {

                     //print "x $i $active ".$links[$i][2]." z";

                     if ($isactive) {

-                        $out .= '<a' . (!empty($links[$i][2]) ? ' id="' . $links[$i][2] . '"' : '') . ' class="tabactive tab inline-block' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">';

+                        $out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tabactive tab inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';

                         $out .= $links[$i][1];

-                        $out .= '</a>' . "\n";

+                        $out .= '</a>'."\n";

                     } else {

-                        $out .= '<a' . (!empty($links[$i][2]) ? ' id="' . $links[$i][2] . '"' : '') . ' class="tabunactive tab inline-block' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">';

+                        $out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tabunactive tab inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';

                         $out .= $links[$i][1];

-                        $out .= '</a>' . "\n";

+                        $out .= '</a>'."\n";

                     }

                 }

                 $out .= '</div>';

@@ -1263,14 +1263,14 @@ 
                 $outmore .= '<div class="popuptab wordwrap" style="display:inherit;">';

                 if (isset($links[$i][2]) && $links[$i][2] == 'image') {

                     if (!empty($links[$i][0]))

-                        $outmore .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n";

+                        $outmore .= '<a class="tabimage'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";

                     else

-                        $outmore .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n";

+                        $outmore .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";

                 }

                 else if (!empty($links[$i][1])) {

-                    $outmore .= '<a' . (!empty($links[$i][2]) ? ' id="' . $links[$i][2] . '"' : '') . ' class="wordwrap inline-block' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">';

+                    $outmore .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="wordwrap inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';

                     $outmore .= preg_replace('/([a-z])\/([a-z])/i', '\\1 / \\2', $links[$i][1]); // Replace x/y with x / y to allow wrap on long composed texts.

-                    $outmore .= '</a>' . "\n";

+                    $outmore .= '</a>'."\n";

                 }

                 $outmore .= '</div>';

 

@@ -1286,24 +1286,24 @@ 
             $right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');

 

             $tabsname = str_replace("@", "", $picto);

-            $out .= '<div id="moretabs' . $tabsname . '" class="inline-block tabsElem">';

-            $out .= '<a href="#" class="tab moretab inline-block tabunactive reposition">' . $langs->trans("More") . '... (' . $nbintab . ')</a>';

-            $out .= '<div id="moretabsList' . $tabsname . '" style="position: absolute; ' . $left . ': -999em; text-align: ' . $left . '; margin:0px; padding:2px">';

+            $out .= '<div id="moretabs'.$tabsname.'" class="inline-block tabsElem">';

+            $out .= '<a href="#" class="tab moretab inline-block tabunactive reposition">'.$langs->trans("More").'... ('.$nbintab.')</a>';

+            $out .= '<div id="moretabsList'.$tabsname.'" style="position: absolute; '.$left.': -999em; text-align: '.$left.'; margin:0px; padding:2px">';

             $out .= $outmore;

             $out .= '</div>';

             $out .= '<div></div>';

             $out .= "</div>\n";

 

             $out .= "<script>";

-            $out .= "$('#moretabs" . $tabsname . "').mouseenter( function() { console.log('mouseenter " . $left . "'); $('#moretabsList" . $tabsname . "').css('" . $left . "','auto');});";

-            $out .= "$('#moretabs" . $tabsname . "').mouseleave( function() { console.log('mouseleave " . $left . "'); $('#moretabsList" . $tabsname . "').css('" . $left . "','-999em');});";

+            $out .= "$('#moretabs".$tabsname."').mouseenter( function() { console.log('mouseenter ".$left."'); $('#moretabsList".$tabsname."').css('".$left."','auto');});";

+            $out .= "$('#moretabs".$tabsname."').mouseleave( function() { console.log('mouseleave ".$left."'); $('#moretabsList".$tabsname."').css('".$left."','-999em');});";

             $out .= "</script>";

         }

 

         $out .= "</div>\n";

 

         if (!$notab || $notab == -1)

-            $out .= "\n" . '<div class="tabBar' . ($notab == -1 ? '' : ' tabBarWithBottom') . '">' . "\n";

+            $out .= "\n".'<div class="tabBar'.($notab == -1 ? '' : ' tabBarWithBottom').'">'."\n";

 

         $parameters = array('tabname' => $active, 'out' => $out);

         $reshook = $hookmanager->executeHooks('printTabsHead', $parameters); // This hook usage is called just before output the head of tabs. Take also a look at "completeTabsHead"

@@ -1412,7 +1412,7 @@ 
             if (Globals::$conf->browser->layout == 'phone')

                 $maxvisiblephotos = 1;

             if ($showimage)

-                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('product', Globals::$conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';

+                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('product', Globals::$conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>';

             else {

                 if (!empty(Globals::$conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {

                     $nophoto = '';

@@ -1421,18 +1421,18 @@ 
 //elseif (Globals::$conf->browser->layout != 'phone') {    // Show no photo link

                 $nophoto = '/public/theme/common/nophoto.png';

 // $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . DOL_BASE_URI . $nophoto . '"></div>';

-                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . DOL_BASE_URI . $nophoto . '"></div>';

+                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" border="0"'.($width ? ' width="'.$width.'"' : '').' src="'.DOL_BASE_URI.$nophoto.'"></div>';

 //}

             }

         } elseif ($object->element == 'ticket') {

             $width = 80;

             $cssclass = 'photoref';

-            $showimage = $object->is_photo_available(Globals::$conf->ticket->multidir_output[$entity] . '/' . $object->track_id);

+            $showimage = $object->is_photo_available(Globals::$conf->ticket->multidir_output[$entity].'/'.$object->track_id);

             $maxvisiblephotos = (isset(Globals::$conf->global->TICKETSUP_MAX_VISIBLE_PHOTO) ? Globals::$conf->global->TICKETSUP_MAX_VISIBLE_PHOTO : 2);

             if (Globals::$conf->browser->layout == 'phone')

                 $maxvisiblephotos = 1;

             if ($showimage)

-                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('ticket', Globals::$conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';

+                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('ticket', Globals::$conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>';

             else {

                 if (!empty(Globals::$conf->global->TICKETSUP_NODISPLAYIFNOPHOTO)) {

                     $nophoto = '';

@@ -1441,7 +1441,7 @@ 
 //elseif (Globals::$conf->browser->layout != 'phone') {    // Show no photo link

                 $nophoto = '/public/theme/common/nophoto.png';

 //$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . DOL_BASE_URI . $nophoto . '"></div>';

-                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . DOL_BASE_URI . $nophoto . '"></div>';

+                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" border="0"'.($width ? ' width="'.$width.'"' : '').' src="'.DOL_BASE_URI.$nophoto.'"></div>';

 //}

             }

         } else {

@@ -1451,25 +1451,25 @@ 
                     // Check if a preview file is available

                     if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter', 'contract', 'supplier_order', 'supplier_proposal', 'supplier_invoice', 'expensereport')) && class_exists("Imagick")) {

                         $objectref = dol_sanitizeFileName($object->ref);

-                        $dir_output = (empty(Globals::$conf->$modulepart->multidir_output[$entity]) ? Globals::$conf->$modulepart->dir_output : Globals::$conf->$modulepart->multidir_output[$entity]) . "/";

+                        $dir_output = (empty(Globals::$conf->$modulepart->multidir_output[$entity]) ? Globals::$conf->$modulepart->dir_output : Globals::$conf->$modulepart->multidir_output[$entity])."/";

                         if (in_array($modulepart, array('invoice_supplier', 'supplier_invoice'))) {

                             $subdir = get_exdir($object->id, 2, 0, 1, $object, $modulepart);

-                            $subdir .= ((!empty($subdir) && !preg_match('/\/$/', $subdir)) ? '/' : '') . $objectref;  // the objectref dir is not included into get_exdir when used with level=2, so we add it at end

+                            $subdir .= ((!empty($subdir) && !preg_match('/\/$/', $subdir)) ? '/' : '').$objectref; // the objectref dir is not included into get_exdir when used with level=2, so we add it at end

                         } else {

                             $subdir = get_exdir($object->id, 0, 0, 1, $object, $modulepart);

                         }

                         if (empty($subdir))

                             $subdir = 'errorgettingsubdirofobject'; // Protection to avoid to return empty path

 

-                        $filepath = $dir_output . $subdir . "/";

+                        $filepath = $dir_output.$subdir."/";

 

-                        $file = $filepath . $objectref . ".pdf";

-                        $relativepath = $subdir . '/' . $objectref . '.pdf';

+                        $file = $filepath.$objectref.".pdf";

+                        $relativepath = $subdir.'/'.$objectref.'.pdf';

 

                         // Define path to preview pdf file (preview precompiled "file.ext" are "file.ext_preview.png")

-                        $fileimage = $file . '_preview.png';              // If PDF has 1 page

-                        $fileimagebis = $file . '_preview-0.png';         // If PDF has more than one page

-                        $relativepathimage = $relativepath . '_preview.png';

+                        $fileimage = $file.'_preview.png'; // If PDF has 1 page

+                        $fileimagebis = $file.'_preview-0.png'; // If PDF has more than one page

+                        $relativepathimage = $relativepath.'_preview.png';

 

                         // Si fichier PDF existe

                         if (file_exists($file)) {

@@ -1478,7 +1478,7 @@ 
                             if ((!file_exists($fileimage) || (filemtime($fileimage) < filemtime($file))) && (!file_exists($fileimagebis) || (filemtime($fileimagebis) < filemtime($file)))

                             ) {

                                 if (empty(Globals::$conf->global->MAIN_DISABLE_PDF_THUMBS)) {  // If you experienc trouble with pdf thumb generation and imagick, you can disable here.

-                                    include_once DOL_BASE_PATH . '/core/lib/files.lib.php';

+                                    include_once DOL_BASE_PATH.'/core/lib/files.lib.php';

                                     $ret = dol_convert_file($file, 'png', $fileimage);

                                     if ($ret < 0)

                                         $error++;

@@ -1491,14 +1491,14 @@ 
                             // Si fichier png PDF d'1 page trouve

                             if (file_exists($fileimage)) {

                                 $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';

-                                $phototoshow .= '<img height="' . $heightforphotref . '" class="photo photowithmargin photowithborder" src="' . DOL_BASE_URI . '/viewimage.php?modulepart=apercu' . $modulepart . '&amp;file=' . urlencode($relativepathimage) . '">';

+                                $phototoshow .= '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_BASE_URI.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';

                                 $phototoshow .= '</div></div>';

                             }

                             // Si fichier png PDF de plus d'1 page trouve

                             elseif (file_exists($fileimagebis)) {

-                                $preview = preg_replace('/\.png/', '', $relativepathimage) . "-0.png";

+                                $preview = preg_replace('/\.png/', '', $relativepathimage)."-0.png";

                                 $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';

-                                $phototoshow .= '<img height="' . $heightforphotref . '" class="photo photowithmargin photowithborder" src="' . DOL_BASE_URI . '/viewimage.php?modulepart=apercu' . $modulepart . '&amp;file=' . urlencode($preview) . '"><p>';

+                                $phototoshow .= '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_BASE_URI.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($preview).'"><p>';

                                 $phototoshow .= '</div></div>';

                             }

                         }

@@ -1525,10 +1525,10 @@ 
                         $picto = $object->picto;

                         if ($object->element == 'project' && !$object->public)

                             $picto = 'project'; // instead of projectpub

-                        $nophoto = img_picto('', 'object_' . $picto, '', false, 1);

+                        $nophoto = img_picto('', 'object_'.$picto, '', false, 1);

                     }

                     $morehtmlleft .= '<!-- No photo to show -->';

-                    $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . $nophoto . '"></div></div>';

+                    $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" border="0"'.($width ? ' width="'.$width.'"' : '').' src="'.$nophoto.'"></div></div>';

 

                     $morehtmlleft .= '</div>';

                 }

@@ -1536,7 +1536,7 @@ 
         }

 

         if ($showbarcode)

-            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $form->showbarcode($object) . '</div>';

+            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object).'</div>';

 

         if ($object->element == 'societe') {

             if (!empty(Globals::$conf->use_javascript_ajax) && $user->rights->societe->creer && !empty(Globals::$conf->global->MAIN_DIRECT_STATUS_UPDATE)) {

@@ -1549,14 +1549,14 @@ 
             if (!empty(Globals::$conf->use_javascript_ajax) && $user->rights->produit->creer && !empty(Globals::$conf->global->MAIN_DIRECT_STATUS_UPDATE)) {

                 $morehtmlstatus .= ajax_object_onoff($object, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');

             } else {

-                $morehtmlstatus .= '<span class="statusrefsell">' . $object->getLibStatut(5, 0) . '</span>';

+                $morehtmlstatus .= '<span class="statusrefsell">'.$object->getLibStatut(5, 0).'</span>';

             }

             $morehtmlstatus .= ' &nbsp; ';

 //$morehtmlstatus.=$langs->trans("Status").' ('.$langs->trans("Buy").') ';

             if (!empty(Globals::$conf->use_javascript_ajax) && $user->rights->produit->creer && !empty(Globals::$conf->global->MAIN_DIRECT_STATUS_UPDATE)) {

                 $morehtmlstatus .= ajax_object_onoff($object, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');

             } else {

-                $morehtmlstatus .= '<span class="statusrefbuy">' . $object->getLibStatut(5, 1) . '</span>';

+                $morehtmlstatus .= '<span class="statusrefbuy">'.$object->getLibStatut(5, 1).'</span>';

             }

         } elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan'))) {

             $tmptxt = $object->getLibStatut(6, $object->totalpaye);

@@ -1583,7 +1583,7 @@ 
             if ($object->progress >= 100)

                 $object->fk_statut = 3;

             $tmptxt = $object->getLibStatut(5);

-            $morehtmlstatus .= $tmptxt;  // No status on task

+            $morehtmlstatus .= $tmptxt; // No status on task

         }

         else { // Generic case

             $tmptxt = $object->getLibStatut(6);

@@ -1597,18 +1597,18 @@ 
             if (method_exists($object, 'getVentilExportCompta')) {

                 $accounted = $object->getVentilExportCompta();

                 $langs->load("accountancy");

-                $morehtmlstatus .= '</div><div class="statusref statusrefbis">' . ($accounted > 0 ? $langs->trans("Accounted") : $langs->trans("NotYetAccounted"));

+                $morehtmlstatus .= '</div><div class="statusref statusrefbis">'.($accounted > 0 ? $langs->trans("Accounted") : $langs->trans("NotYetAccounted"));

             }

         }

 

 // Add alias for thirdparty

         if (!empty($object->name_alias))

-            $morehtmlref .= '<div class="refidno">' . $object->name_alias . '</div>';

+            $morehtmlref .= '<div class="refidno">'.$object->name_alias.'</div>';

 

 // Add label

         if ($object->element == 'product' || $object->element == 'bank_account' || $object->element == 'project_task') {

             if (!empty($object->label))

-                $morehtmlref .= '<div class="refidno">' . $object->label . '</div>';

+                $morehtmlref .= '<div class="refidno">'.$object->label.'</div>';

         }

 

         if (method_exists($object, 'getBannerAddress') && $object->element != 'product' && $object->element != 'bookmark' && $object->element != 'ecm_directories' && $object->element != 'ecm_files') {

@@ -1618,11 +1618,11 @@ 
         }

         if (!empty(Globals::$conf->global->MAIN_SHOW_TECHNICAL_ID) && in_array($object->element, array('societe', 'contact', 'member', 'product'))) {

             $morehtmlref .= '<div style="clear: both;"></div><div class="refidno">';

-            $morehtmlref .= $langs->trans("TechnicalID") . ': ' . $object->id;

+            $morehtmlref .= $langs->trans("TechnicalID").': '.$object->id;

             $morehtmlref .= '</div>';

         }

 

-        print '<div class="' . ($onlybanner ? 'arearefnobottom ' : 'arearef ') . 'heightref valignmiddle" width="100%">';

+        print '<div class="'.($onlybanner ? 'arearefnobottom ' : 'arearef ').'heightref valignmiddle" width="100%">';

         print $form->showrefnav($object, $paramid, $morehtml, $shownav, $fieldid, $fieldref, $morehtmlref, $moreparam, $nodbprefix, $morehtmlleft, $morehtmlstatus, $morehtmlright);

         print '</div>';

         print '<div class="underrefbanner clearboth"></div>';

@@ -1644,7 +1644,7 @@ 
         if ($fieldrequired)

             $ret .= '<span class="fieldrequired">';

         if ((Globals::$conf->dol_use_jmobile != 4))

-            $ret .= '<label for="' . $fieldkey . '">';

+            $ret .= '<label for="'.$fieldkey.'">';

         $ret .= $langs->trans($langkey);

         if ((Globals::$conf->dol_use_jmobile != 4))

             $ret .= '</label>';

@@ -1663,9 +1663,9 @@ 
     static function dol_bc($var, $moreclass = '')

     {

        // global $bc;

-        $ret = ' ' . $bc[$var];

+        $ret = ' '.$bc[$var];

         if ($moreclass)

-            $ret = preg_replace('/class=\"/', 'class="' . $moreclass . ' ', $ret);

+            $ret = preg_replace('/class=\"/', 'class="'.$moreclass.' ', $ret);

         return $ret;

     }

 

@@ -1685,50 +1685,50 @@ 
        // global Globals::$conf, $langs;

 

         $ret = '';

-        $countriesusingstate = array('AU', 'CA', 'US', 'IN', 'GB', 'ES', 'UK', 'TR');    // See also MAIN_FORCE_STATE_INTO_ADDRESS

+        $countriesusingstate = array('AU', 'CA', 'US', 'IN', 'GB', 'ES', 'UK', 'TR'); // See also MAIN_FORCE_STATE_INTO_ADDRESS

 // Address

         if (empty($mode)) {

             $ret .= $object->address;

         }

 // Zip/Town/State

         if (in_array($object->country_code, array('AU', 'CA', 'US')) || !empty(Globals::$conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)) {    // US: title firstname name \n address lines \n town, state, zip \n country

-            $ret .= ($ret ? $sep : '' ) . $object->town;

+            $ret .= ($ret ? $sep : '').$object->town;

             if ($object->state) {

-                $ret .= ($ret ? ", " : '') . $object->state;

+                $ret .= ($ret ? ", " : '').$object->state;

             }

             if ($object->zip)

-                $ret .= ($ret ? ", " : '') . $object->zip;

+                $ret .= ($ret ? ", " : '').$object->zip;

         }

         else if (in_array($object->country_code, array('GB', 'UK'))) { // UK: title firstname name \n address lines \n town state \n zip \n country

-            $ret .= ($ret ? $sep : '' ) . $object->town;

+            $ret .= ($ret ? $sep : '').$object->town;

             if ($object->state) {

-                $ret .= ($ret ? ", " : '') . $object->state;

+                $ret .= ($ret ? ", " : '').$object->state;

             }

             if ($object->zip)

-                $ret .= ($ret ? $sep : '' ) . $object->zip;

+                $ret .= ($ret ? $sep : '').$object->zip;

         }

         else if (in_array($object->country_code, array('ES', 'TR'))) { // ES: title firstname name \n address lines \n zip town \n state \n country

-            $ret .= ($ret ? $sep : '' ) . $object->zip;

-            $ret .= ($object->town ? (($object->zip ? ' ' : '') . $object->town) : '');

+            $ret .= ($ret ? $sep : '').$object->zip;

+            $ret .= ($object->town ? (($object->zip ? ' ' : '').$object->town) : '');

             if ($object->state) {

-                $ret .= "\n" . $object->state;

+                $ret .= "\n".$object->state;

             }

         } else if (in_array($object->country_code, array('IT'))) { // IT: tile firstname name\n address lines \n zip (Code Departement) \n country

-            $ret .= ($ret ? $sep : '' ) . $object->zip;

-            $ret .= ($object->town ? (($object->zip ? ' ' : '') . $object->town) : '');

-            $ret .= ($object->departement_id ? (' (' . ($object->departement_id) . ')') : '');

+            $ret .= ($ret ? $sep : '').$object->zip;

+            $ret .= ($object->town ? (($object->zip ? ' ' : '').$object->town) : '');

+            $ret .= ($object->departement_id ? (' ('.($object->departement_id).')') : '');

         } else {                                          // Other: title firstname name \n address lines \n zip town \n country

-            $ret .= $object->zip ? (($ret ? $sep : '' ) . $object->zip) : '';

-            $ret .= ($object->town ? (($object->zip ? ' ' : ($ret ? $sep : '' )) . $object->town) : '');

+            $ret .= $object->zip ? (($ret ? $sep : '').$object->zip) : '';

+            $ret .= ($object->town ? (($object->zip ? ' ' : ($ret ? $sep : '')).$object->town) : '');

             if ($object->state && in_array($object->country_code, $countriesusingstate)) {

-                $ret .= ($ret ? ", " : '') . $object->state;

+                $ret .= ($ret ? ", " : '').$object->state;

             }

         }

         if (!is_object($outputlangs))

             $outputlangs = $langs;

         if ($withcountry) {

             $langs->load("dict");

-            $ret .= ($object->country_code ? ($ret ? $sep : '') . $outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country" . $object->country_code)) : '');

+            $ret .= ($object->country_code ? ($ret ? $sep : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->country_code)) : '');

         }

 

         return $ret;

@@ -1782,13 +1782,13 @@ 
             if (is_string($tzoutput)) {

                 if ($tzoutput == 'tzserver') {

                     $to_gmt = false;

-                    $offsettzstring = @date_default_timezone_get();  // Example 'Europe/Berlin' or 'Indian/Reunion'

+                    $offsettzstring = @date_default_timezone_get(); // Example 'Europe/Berlin' or 'Indian/Reunion'

                     $offsettz = 0;

                     $offsetdst = 0;

                 } elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel') {

                     $to_gmt = true;

                     $offsettzstring = (empty($_SESSION['dol_tz_string']) ? 'UTC' : $_SESSION['dol_tz_string']); // Example 'Europe/Berlin' or 'Indian/Reunion'

-                    $offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60;  // Will not be used anymore

+                    $offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60; // Will not be used anymore

                     $offsetdst = (empty($_SESSION['dol_dst']) ? 0 : $_SESSION['dol_dst']) * 60 * 60; // Will not be used anymore

                 }

             }

@@ -1834,9 +1834,9 @@ 
         else if ($format == 'dayxcard')

             $format = '%Y%m%d';

         else if ($format == 'dayrfc')

-            $format = '%Y-%m-%d';             // DATE_RFC3339

+            $format = '%Y-%m-%d'; // DATE_RFC3339

         else if ($format == 'dayhourrfc')

-            $format = '%Y-%m-%dT%H:%M:%SZ';   // DATETIME RFC3339

+            $format = '%Y-%m-%dT%H:%M:%SZ'; // DATETIME RFC3339

         else if ($format == 'standard')

             $format = '%Y-%m-%d %H:%M:%S';

 

@@ -1847,7 +1847,7 @@ 
 

 // If date undefined or "", we return ""

         if (dol_strlen($time) == 0)

-            return '';  // $time=0 allowed (it means 01/01/1970 00:00:00)

+            return ''; // $time=0 allowed (it means 01/01/1970 00:00:00)

 

 

 

@@ -1898,7 +1898,7 @@ 
         if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $time, $reg) || preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i', $time, $reg)) { // Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000

 // TODO Remove this.

 // This part of code should not be used.

-            dol_syslog("Functions.lib::dol_print_date static function call with deprecated value of time in page " . $_SERVER["PHP_SELF"], LOG_ERR);

+            dol_syslog("Functions.lib::dol_print_date static function call with deprecated value of time in page ".$_SERVER["PHP_SELF"], LOG_ERR);

 // Date has format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS' or 'YYYYMMDDHHMMSS'

             $syear = (!empty($reg[1]) ? $reg[1] : '');

             $smonth = (!empty($reg[2]) ? $reg[2] : '');

@@ -1916,7 +1916,7 @@ 
 

                 $ret = adodb_strftime($format, $timetouse, $to_gmt);

             } else

-                $ret = 'Bad value ' . $time . ' for date';

+                $ret = 'Bad value '.$time.' for date';

         }

 

         if (preg_match('/__b__/i', $format)) {

@@ -1925,11 +1925,11 @@ 
             $month = adodb_strftime('%m', $timetouse);

             $month = sprintf("%02d", $month); // $month may be return with format '06' on some installation and '6' on other, so we force it to '06'.

             if ($encodetooutput) {

-                $monthtext = $outputlangs->transnoentities('Month' . $month);

-                $monthtextshort = $outputlangs->transnoentities('MonthShort' . $month);

+                $monthtext = $outputlangs->transnoentities('Month'.$month);

+                $monthtextshort = $outputlangs->transnoentities('MonthShort'.$month);

             } else {

-                $monthtext = $outputlangs->transnoentitiesnoconv('Month' . $month);

-                $monthtextshort = $outputlangs->transnoentitiesnoconv('MonthShort' . $month);

+                $monthtext = $outputlangs->transnoentitiesnoconv('Month'.$month);

+                $monthtextshort = $outputlangs->transnoentitiesnoconv('MonthShort'.$month);

             }

 //print 'monthtext='.$monthtext.' monthtextshort='.$monthtextshort;

             $ret = str_replace('__b__', $monthtextshort, $ret);

@@ -1940,8 +1940,8 @@ 
         if (preg_match('/__a__/i', $format)) {

             $timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with static function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.

 

-            $w = adodb_strftime('%w', $timetouse);      // TODO Replace this with static function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.

-            $dayweek = $outputlangs->transnoentitiesnoconv('Day' . $w);

+            $w = adodb_strftime('%w', $timetouse); // TODO Replace this with static function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.

+            $dayweek = $outputlangs->transnoentitiesnoconv('Day'.$w);

             $ret = str_replace('__A__', $dayweek, $ret);

             $ret = str_replace('__a__', dol_substr($dayweek, 0, 3), $ret);

         }

@@ -1988,9 +1988,9 @@ 
 

         $usealternatemethod = false;

         if ($timestamp <= 0)

-            $usealternatemethod = true;    // <= 1970

+            $usealternatemethod = true; // <= 1970

         if ($timestamp >= 2145913200)

-            $usealternatemethod = true;  // >= 2038

+            $usealternatemethod = true; // >= 2038

 

         if ($usealternatemethod) {

             $arrayinfo = adodb_getdate($timestamp, $fast);

@@ -2050,23 +2050,23 @@ 
 

         if (method_exists('DateTime', 'getTimestamp')) {

             if (empty($gm) || $gm === 'server') {

-                $default_timezone = @date_default_timezone_get();  // Example 'Europe/Berlin'

+                $default_timezone = @date_default_timezone_get(); // Example 'Europe/Berlin'

                 $localtz = new DateTimeZone($default_timezone);

             } else if ($gm === 'user') {

 // We use dol_tz_string first because it is more reliable.

-                $default_timezone = (empty($_SESSION["dol_tz_string"]) ? @date_default_timezone_get() : $_SESSION["dol_tz_string"]);  // Example 'Europe/Berlin'

+                $default_timezone = (empty($_SESSION["dol_tz_string"]) ? @date_default_timezone_get() : $_SESSION["dol_tz_string"]); // Example 'Europe/Berlin'

                 try {

                     $localtz = new DateTimeZone($default_timezone);

                 } catch (Exception $e) {

-                    dol_syslog("Warning dol_tz_string contains an invalid value " . $_SESSION["dol_tz_string"], LOG_WARNING);

+                    dol_syslog("Warning dol_tz_string contains an invalid value ".$_SESSION["dol_tz_string"], LOG_WARNING);

                     $default_timezone = @date_default_timezone_get();

                 }

             } else if (strrpos($gm, "tz,") !== false) {

-                $timezone = str_replace("tz,", "", $gm);  // Example 'tz,Europe/Berlin'

+                $timezone = str_replace("tz,", "", $gm); // Example 'tz,Europe/Berlin'

                 try {

                     $localtz = new DateTimeZone($timezone);

                 } catch (Exception $e) {

-                    dol_syslog("Warning passed timezone contains an invalid value " . $timezone, LOG_WARNING);

+                    dol_syslog("Warning passed timezone contains an invalid value ".$timezone, LOG_WARNING);

                 }

             }

 

@@ -2105,8 +2105,8 @@ 
         if ($mode == 'gmt')

             $ret = time(); // Time for now at greenwich.

         else if ($mode == 'tzserver') {  // Time for now with PHP server timezone added

-            require_once DOL_BASE_PATH . '/core/lib/date.lib.php';

-            $tzsecond = getServerTimeZoneInt('now');    // Contains tz+dayling saving time

+            require_once DOL_BASE_PATH.'/core/lib/date.lib.php';

+            $tzsecond = getServerTimeZoneInt('now'); // Contains tz+dayling saving time

             $ret = (int) (dol_now('gmt') + ($tzsecond * 3600));

         }

         /* else if ($mode == 'tzref')				// Time for now with parent company timezone is added

@@ -2152,9 +2152,9 @@ 
         }

 // Use long or short text unit

         if (empty($shortunit)) {

-            $ret .= ' ' . $textunitlong;

+            $ret .= ' '.$textunitlong;

         } else {

-            $ret .= ' ' . $textunitshort;

+            $ret .= ' '.$textunitshort;

         }

 

         return $ret;

@@ -2182,13 +2182,13 @@ 
         $link .= $url;

         $link .= '"';

         if ($target)

-            $link .= ' target="' . $target . '"';

+            $link .= ' target="'.$target.'"';

         $link .= '>';

         if (!preg_match('/^http/i', $url))

             $link .= 'http://';

         $link .= dol_trunc($url, $max);

         $link .= '</a>';

-        return '<div class="nospan float" style="margin-right: 10px">' . ($withpicto ? img_picto($langs->trans("Url"), 'object_globe.png') . ' ' : '') . $link . '</div>';

+        return '<div class="nospan float" style="margin-right: 10px">'.($withpicto ? img_picto($langs->trans("Url"), 'object_globe.png').' ' : '').$link.'</div>';

     }

 

     /**

@@ -2229,9 +2229,9 @@ 
                 $type = 'AC_EMAIL';

                 $link = '';

                 if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFOREMAIL))

-                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';

+                    $link = '<a href="'.DOL_BASE_URI.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';

                 if ($link)

-                    $newemail = '<div>' . $newemail . ' ' . $link . '</div>';

+                    $newemail = '<div>'.$newemail.' '.$link.'</div>';

             }

         }

         else {

@@ -2241,7 +2241,7 @@ 
             }

         }

 

-        $rep = '<div class="nospan float" style="margin-right: 10px">' . ($withpicto ? img_picto($langs->trans("EMail"), 'object_email.png') . ' ' : '') . $newemail . '</div>';

+        $rep = '<div class="nospan float" style="margin-right: 10px">'.($withpicto ? img_picto($langs->trans("EMail"), 'object_email.png').' ' : '').$newemail.'</div>';

         if ($hookmanager) {

             $parameters = array('cid' => $cid, 'socid' => $socid, 'addlink' => $addlink, 'picto' => $withpicto);

             $reshook = $hookmanager->executeHooks('printEmail', $parameters, $email);

@@ -2271,26 +2271,26 @@ 
 

         if (!empty($type)) {

             $newskype = '<div class="divsocialnetwork inline-block valignmiddle">';

-            $newskype .= img_picto($langs->trans(strtoupper($type)), $type . '.png', '', false, 0, 0, '', 'paddingright');

+            $newskype .= img_picto($langs->trans(strtoupper($type)), $type.'.png', '', false, 0, 0, '', 'paddingright');

             $newskype .= $value;

             if ($type == 'skype') {

                 $newskype .= '&nbsp;';

                 $newskype .= '<a href="skype:';

                 $newskype .= $value;

-                $newskype .= '?call" alt="' . $langs->trans("Call") . '&nbsp;' . $value . '" title="' . $langs->trans("Call") . '&nbsp;' . $value . '">';

-                $newskype .= '<img src="' . DOL_BASE_URI . '/theme/common/skype_callbutton.png" border="0">';

+                $newskype .= '?call" alt="'.$langs->trans("Call").'&nbsp;'.$value.'" title="'.$langs->trans("Call").'&nbsp;'.$value.'">';

+                $newskype .= '<img src="'.DOL_BASE_URI.'/theme/common/skype_callbutton.png" border="0">';

                 $newskype .= '</a><a href="skype:';

                 $newskype .= $value;

-                $newskype .= '?chat" alt="' . $langs->trans("Chat") . '&nbsp;' . $value . '" title="' . $langs->trans("Chat") . '&nbsp;' . $value . '">';

-                $newskype .= '<img class="paddingleft" src="' . DOL_BASE_URI . '/theme/common/skype_chatbutton.png" border="0">';

+                $newskype .= '?chat" alt="'.$langs->trans("Chat").'&nbsp;'.$value.'" title="'.$langs->trans("Chat").'&nbsp;'.$value.'">';

+                $newskype .= '<img class="paddingleft" src="'.DOL_BASE_URI.'/theme/common/skype_chatbutton.png" border="0">';

                 $newskype .= '</a>';

             }

             if (($cid || $socid) && !empty(Globals::$conf->agenda->enabled) && $user->rights->agenda->myactions->create && $type == 'skype') {

                 $addlink = 'AC_SKYPE';

                 $link = '';

                 if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORSKYPE))

-                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $addlink . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';

-                $newskype .= ($link ? ' ' . $link : '');

+                    $link = '<a href="'.DOL_BASE_URI.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$addlink.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';

+                $newskype .= ($link ? ' '.$link : '');

             }

             $newskype .= '</div>';

         }

@@ -2334,165 +2334,165 @@ 
         if (strtoupper($countrycode) == "FR") {

 // France

             if (dol_strlen($phone) == 10) {

-                $newphone = substr($newphone, 0, 2) . $separ . substr($newphone, 2, 2) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2);

+                $newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 2).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2);

             } elseif (dol_strlen($phone) == 7) {

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2);

             } elseif (dol_strlen($phone) == 9) {

-                $newphone = substr($newphone, 0, 2) . $separ . substr($newphone, 2, 3) . $separ . substr($newphone, 5, 2) . $separ . substr($newphone, 7, 2);

+                $newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 3).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2);

             } elseif (dol_strlen($phone) == 11) {

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 2) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);

             } elseif (dol_strlen($phone) == 12) {

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "CA") {

             if (dol_strlen($phone) == 10) {

-                $newphone = ($separ != '' ? '(' : '') . substr($newphone, 0, 3) . ($separ != '' ? ')' : '') . $separ . substr($newphone, 3, 3) . ($separ != '' ? '-' : '') . substr($newphone, 6, 4);

+                $newphone = ($separ != '' ? '(' : '').substr($newphone, 0, 3).($separ != '' ? ')' : '').$separ.substr($newphone, 3, 3).($separ != '' ? '-' : '').substr($newphone, 6, 4);

             }

         } elseif (strtoupper($countrycode) == "PT") {//Portugal

             if (dol_strlen($phone) == 13) {//ex: +351_ABC_DEF_GHI

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);

             }

         } elseif (strtoupper($countrycode) == "SR") {//Suriname

             if (dol_strlen($phone) == 10) {//ex: +597_ABC_DEF

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3);

             } elseif (dol_strlen($phone) == 11) {//ex: +597_ABC_DEFG

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 4);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 4);

             }

         } elseif (strtoupper($countrycode) == "DE") {//Allemagne

             if (dol_strlen($phone) == 14) {//ex:  +49_ABCD_EFGH_IJK

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 4) . $separ . substr($newphone, 7, 4) . $separ . substr($newphone, 11, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 4).$separ.substr($newphone, 11, 3);

             } elseif (dol_strlen($phone) == 13) {//ex: +49_ABC_DEFG_HIJ

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 4) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 4).$separ.substr($newphone, 10, 3);

             }

         } elseif (strtoupper($countrycode) == "ES") {//Espagne

             if (dol_strlen($phone) == 12) {//ex:  +34_ABC_DEF_GHI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);

             }

         } elseif (strtoupper($countrycode) == "BF") {// Burkina Faso

             if (dol_strlen($phone) == 12) {//ex :  +22 A BC_DE_FG_HI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 1) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "RO") {// Roumanie

             if (dol_strlen($phone) == 12) {//ex :  +40 AB_CDE_FG_HI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "TR") {//Turquie

             if (dol_strlen($phone) == 13) {//ex :  +90 ABC_DEF_GHIJ

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 4);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 4);

             }

         } elseif (strtoupper($countrycode) == "US") {//Etat-Unis

             if (dol_strlen($phone) == 12) {//ex: +1 ABC_DEF_GHIJ

-                $newphone = substr($newphone, 0, 2) . $separ . substr($newphone, 2, 3) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 8, 4);

+                $newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 3).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 4);

             }

         } elseif (strtoupper($countrycode) == "MX") {//Mexique

             if (dol_strlen($phone) == 12) {//ex: +52 ABCD_EFG_HI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 4) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 2);

             } elseif (dol_strlen($phone) == 11) {//ex: +52 AB_CD_EF_GH

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 2) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);

             } elseif (dol_strlen($phone) == 13) {//ex: +52 ABC_DEF_GHIJ

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 4);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 4);

             }

         } elseif (strtoupper($countrycode) == "ML") {//Mali

             if (dol_strlen($phone) == 12) {//ex: +223 AB_CD_EF_GH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "TH") {//Thaïlande

             if (dol_strlen($phone) == 11) {//ex: +66_ABC_DE_FGH

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 3);

             } elseif (dol_strlen($phone) == 12) {//ex: +66_A_BCD_EF_GHI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 1) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 3);

             }

         } elseif (strtoupper($countrycode) == "MU") {//Maurice

             if (dol_strlen($phone) == 11) {//ex: +230_ABC_DE_FG

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);

             } elseif (dol_strlen($phone) == 12) {//ex: +230_ABCD_EF_GH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 4) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 4).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "ZA") {//Afrique du sud

             if (dol_strlen($phone) == 12) {//ex: +27_AB_CDE_FG_HI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "SY") {//Syrie

             if (dol_strlen($phone) == 12) {//ex: +963_AB_CD_EF_GH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             } elseif (dol_strlen($phone) == 13) {//ex: +963_AB_CD_EF_GHI

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 3);

             }

         } elseif (strtoupper($countrycode) == "AE") {//Emirats Arabes Unis

             if (dol_strlen($phone) == 12) {//ex: +971_ABC_DEF_GH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 2);

             } elseif (dol_strlen($phone) == 13) {//ex: +971_ABC_DEF_GHI

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);

             } elseif (dol_strlen($phone) == 14) {//ex: +971_ABC_DEF_GHIK

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 4);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 4);

             }

         } elseif (strtoupper($countrycode) == "DZ") {//Algérie

             if (dol_strlen($phone) == 13) {//ex: +213_ABC_DEF_GHI

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);

             }

         } elseif (strtoupper($countrycode) == "BE") {//Belgique

             if (dol_strlen($phone) == 11) {//ex: +32_ABC_DE_FGH

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 3);

             } elseif (dol_strlen($phone) == 12) {//ex: +32_ABC_DEF_GHI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);

             }

         } elseif (strtoupper($countrycode) == "PF") {//Polynésie française

             if (dol_strlen($phone) == 12) {//ex: +689_AB_CD_EF_GH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "CO") {//Colombie

             if (dol_strlen($phone) == 13) {//ex: +57_ABC_DEF_GH_IJ

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 2) . $separ . substr($newphone, 11, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);

             }

         } elseif (strtoupper($countrycode) == "JO") {//Jordanie

             if (dol_strlen($phone) == 12) {//ex: +962_A_BCD_EF_GH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 1) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 1).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);

             }

         } elseif (strtoupper($countrycode) == "MG") {//Madagascar

             if (dol_strlen($phone) == 13) {//ex: +261_AB_CD_EF_GHI

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 3);

             }

         } elseif (strtoupper($countrycode) == "GB") {//Royaume uni

             if (dol_strlen($phone) == 13) {//ex: +44_ABCD_EFG_HIJ

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 4) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);

             }

         } elseif (strtoupper($countrycode) == "CH") {//Suisse

             if (dol_strlen($phone) == 12) {//ex: +41_AB_CDE_FG_HI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             } elseif (dol_strlen($phone) == 15) {// +41_AB_CDE_FGH_IJKL

-                $newphone = $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 8, 3) . $separ . substr($newphone, 11, 4);

+                $newphone = $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 3).$separ.substr($newphone, 11, 4);

             }

         } elseif (strtoupper($countrycode) == "TN") {//Tunisie

             if (dol_strlen($phone) == 12) {//ex: +216_AB_CDE_FGH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);

             }

         } elseif (strtoupper($countrycode) == "GF") {//Guyane francaise

             if (dol_strlen($phone) == 13) {//ex: +594_ABC_DE_FG_HI  (ABC=594 de nouveau)

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2) . $separ . substr($newphone, 11, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);

             }

         } elseif (strtoupper($countrycode) == "GP") {//Guadeloupe

             if (dol_strlen($phone) == 13) {//ex: +590_ABC_DE_FG_HI  (ABC=590 de nouveau)

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2) . $separ . substr($newphone, 11, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);

             }

         } elseif (strtoupper($countrycode) == "MQ") {//Martinique

             if (dol_strlen($phone) == 13) {//ex: +596_ABC_DE_FG_HI  (ABC=596 de nouveau)

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2) . $separ . substr($newphone, 11, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);

             }

         } elseif (strtoupper($countrycode) == "IT") {//Italie

             if (dol_strlen($phone) == 12) {//ex: +39_ABC_DEF_GHI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);

             } elseif (dol_strlen($phone) == 13) {//ex: +39_ABC_DEF_GH_IJ

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 2) . $separ . substr($newphone, 11, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);

             }

         } elseif (strtoupper($countrycode) == "AU") {//Australie

             if (dol_strlen($phone) == 12) {//ex: +61_A_BCDE_FGHI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 1) . $separ . substr($newphone, 4, 4) . $separ . substr($newphone, 8, 4);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 4).$separ.substr($newphone, 8, 4);

             }

         }

         if (!empty($addlink)) { // Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set)

             if (Globals::$conf->browser->layout == 'phone' || (!empty(Globals::$conf->clicktodial->enabled) && !empty(Globals::$conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS))) { // If phone or option for, we use link of phone

-                $newphone = '<a href="tel:' . $phone . '"';

-                $newphone .= '>' . $phone . '</a>';

+                $newphone = '<a href="tel:'.$phone.'"';

+                $newphone .= '>'.$phone.'</a>';

             } else if (!empty(Globals::$conf->clicktodial->enabled) && $addlink == 'AC_TEL') {  // If click to dial, we use click to dial url

                 if (empty($user->clicktodial_loaded))

                     $user->fetch_clicktodial();

@@ -2516,10 +2516,10 @@ 
                     '__PASS__' => $clicktodial_password);

                 $url = make_substitutions($url, $substitarray);

                 $newphonesav = $newphone;

-                $newphone = '<a href="' . $url . '"';

+                $newphone = '<a href="'.$url.'"';

                 if (!empty(Globals::$conf->global->CLICKTODIAL_FORCENEWTARGET))

                     $newphone .= ' target="_blank"';

-                $newphone .= '>' . $newphonesav . '</a>';

+                $newphone .= '>'.$newphonesav.'</a>';

             }

 

 //if (($cid || $socid) && ! empty(Globals::$conf->agenda->enabled) && $user->rights->agenda->myactions->create)

@@ -2529,9 +2529,9 @@ 
                 if ($addlink == 'AC_FAX')

                     $type = 'AC_FAX';

                 if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORPHONE))

-                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . ($cid ? '&amp;contactid=' . $cid : '') . ($socid ? '&amp;socid=' . $socid : '') . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';

+                    $link = '<a href="'.DOL_BASE_URI.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.($cid ? '&amp;contactid='.$cid : '').($socid ? '&amp;socid='.$socid : '').'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';

                 if ($link)

-                    $newphone = '<div>' . $newphone . ' ' . $link . '</div>';

+                    $newphone = '<div>'.$newphone.' '.$link.'</div>';

             }

         }

 

@@ -2562,7 +2562,7 @@ 
                 $rep .= '<div class="nospan float" style="margin-right: 10px">';

             else

                 $rep .= '<span style="margin-right: 10px;">';

-            $rep .= ($withpicto ? img_picto($titlealt, 'object_' . $picto . '.png') . ' ' : '') . $newphone;

+            $rep .= ($withpicto ? img_picto($titlealt, 'object_'.$picto.'.png').' ' : '').$newphone;

             if ($adddivfloat)

                 $rep .= '</div>';

             else

@@ -2589,15 +2589,15 @@ 
             $ret .= $ip;

         }

 

-        echo ('<p>DOL_BASE_PATH: ' . DOL_BASE_PATH . '/DOL_BASE_URI: ' . DOL_BASE_URI . '</p>');

+        echo ('<p>DOL_BASE_PATH: '.DOL_BASE_PATH.'/DOL_BASE_URI: '.DOL_BASE_URI.'</p>');

 

         if ($mode != 2) {

             $countrycode = dolGetCountryCodeFromIp($ip);

             if ($countrycode) { // If success, countrycode is us, fr, ...

-                if (file_exists(DOL_BASE_PATH . '/theme/common/flags/' . $countrycode . '.png')) {

-                    $ret .= ' ' . img_picto($countrycode . ' ' . $langs->trans("AccordingToGeoIPDatabase"), DOL_BASE_URI . '/theme/common/flags/' . $countrycode . '.png', '', 1);

+                if (file_exists(DOL_BASE_PATH.'/theme/common/flags/'.$countrycode.'.png')) {

+                    $ret .= ' '.img_picto($countrycode.' '.$langs->trans("AccordingToGeoIPDatabase"), DOL_BASE_URI.'/theme/common/flags/'.$countrycode.'.png', '', 1);

                 } else

-                    $ret .= ' (' . $countrycode . ')';

+                    $ret .= ' ('.$countrycode.')';

             }

         }

 

@@ -2635,7 +2635,7 @@ 
 //$ip='24.24.24.24';

 //$datafile='E:\Mes Sites\Web\Admin1\awstats\maxmind\GeoIP.dat';    Note that this must be downloaded datafile (not same than datafile provided with ubuntu packages)

 

-            include_once DOL_BASE_PATH . '/core/class/dolgeoip.class.php';

+            include_once DOL_BASE_PATH.'/core/class/dolgeoip.class.php';

             $geoip = new DolGeoIP('country', $datafile);

 //print 'ip='.$ip.' databaseType='.$geoip->gi->databaseType." GEOIP_CITY_EDITION_REV1=".GEOIP_CITY_EDITION_REV1."\n";

 //print "geoip_country_id_by_addr=".geoip_country_id_by_addr($geoip->gi,$ip)."\n";

@@ -2661,7 +2661,7 @@ 
             $datafile = Globals::$conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE;

 //$ip='24.24.24.24';

 //$datafile='E:\Mes Sites\Web\Admin1\awstats\maxmind\GeoIP.dat';

-            include_once DOL_BASE_PATH . '/core/class/dolgeoip.class.php';

+            include_once DOL_BASE_PATH.'/core/class/dolgeoip.class.php';

             $geoip = new DolGeoIP('country', $datafile);

             $countrycode = $geoip->getCountryCodeFromIP($ip);

             $ret = $countrycode;

@@ -2716,12 +2716,12 @@ 
                     $showomap = 1;

 

                 if ($showgmap) {

-                    $url = dol_buildpath('/google/gmaps.php?mode=' . $mode . '&id=' . $id, 1);

-                    $out .= ' <a href="' . $url . '" target="_gmaps"><img id="' . $htmlid . '" class="valigntextbottom" src="' . DOL_BASE_URI . '/theme/common/gmap.png"></a>';

+                    $url = dol_buildpath('/google/gmaps.php?mode='.$mode.'&id='.$id, 1);

+                    $out .= ' <a href="'.$url.'" target="_gmaps"><img id="'.$htmlid.'" class="valigntextbottom" src="'.DOL_BASE_URI.'/theme/common/gmap.png"></a>';

                 }

                 if ($showomap) {

-                    $url = dol_buildpath('/openstreetmap/maps.php?mode=' . $mode . '&id=' . $id, 1);

-                    $out .= ' <a href="' . $url . '" target="_gmaps"><img id="' . $htmlid . '_openstreetmap" class="valigntextbottom" src="' . DOL_BASE_URI . '/theme/common/gmap.png"></a>';

+                    $url = dol_buildpath('/openstreetmap/maps.php?mode='.$mode.'&id='.$id, 1);

+                    $out .= ' <a href="'.$url.'" target="_gmaps"><img id="'.$htmlid.'_openstreetmap" class="valigntextbottom" src="'.DOL_BASE_URI.'/theme/common/gmap.png"></a>';

                 }

             }

         }

@@ -2867,7 +2867,7 @@ 
         if ($trunc == 'right') {

             $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

             if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

-                return dol_substr($newstring, 0, $size, $stringencoding) . ($nodot ? '' : '...');

+                return dol_substr($newstring, 0, $size, $stringencoding).($nodot ? '' : '...');

             else

 //return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;

                 return $string;

@@ -2877,21 +2877,21 @@ 
             if (dol_strlen($newstring, $stringencoding) > 2 && dol_strlen($newstring, $stringencoding) > ($size + 1)) {

                 $size1 = round($size / 2);

                 $size2 = round($size / 2);

-                return dol_substr($newstring, 0, $size1, $stringencoding) . '...' . dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size2, $size2, $stringencoding);

+                return dol_substr($newstring, 0, $size1, $stringencoding).'...'.dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size2, $size2, $stringencoding);

             } else

                 return $string;

         }

         elseif ($trunc == 'left') {

             $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

             if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

-                return '...' . dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);

+                return '...'.dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);

             else

                 return $string;

         }

         elseif ($trunc == 'wrap') {

             $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

             if (dol_strlen($newstring, $stringencoding) > ($size + 1))

-                return dol_substr($newstring, 0, $size, $stringencoding) . "\n" . dol_trunc(dol_substr($newstring, $size, dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);

+                return dol_substr($newstring, 0, $size, $stringencoding)."\n".dol_trunc(dol_substr($newstring, $size, dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);

             else

                 return $string;

         } else

@@ -2924,7 +2924,7 @@ 
         $url = DOL_BASE_URI;

 

         $theme = Globals::$conf->theme;

-        $path = 'theme/' . $theme;

+        $path = 'theme/'.$theme;

 

 // Define fullpathpicto to use into src

         if ($pictoisfullpath) {

@@ -2973,7 +2973,7 @@ 
                     $fakey = 'fa-pencil';

                     $facolor = '#444';

                 } elseif ($pictowithoutext == 'filter') {

-                    $fakey = 'fa-' . $pictowithoutext;

+                    $fakey = 'fa-'.$pictowithoutext;

                 } elseif ($pictowithoutext == 'grip_title' || $pictowithoutext == 'grip') {

                     $fakey = 'fa-arrows';

                 } elseif ($pictowithoutext == 'listlight') {

@@ -3012,15 +3012,15 @@ 
                 } elseif ($pictowithoutext == 'jabber') {

                     $fakey = 'fa-comment-o';

                 } else {

-                    $fakey = 'fa-' . $pictowithoutext;

+                    $fakey = 'fa-'.$pictowithoutext;

                     $facolor = '#444';

                     $marginleftonlyshort = 0;

                 }

 

                 if (preg_match('/class="([^"]+)"/', $moreatt, $reg)) {

-                    $morecss .= ($morecss ? ' ' : '') . $reg[1];

+                    $morecss .= ($morecss ? ' ' : '').$reg[1];

                 }

-                $enabledisablehtml = '<span class="fa ' . $fakey . ' ' . ($marginleftonlyshort ? ($marginleftonlyshort == 1 ? 'marginleftonlyshort' : 'marginleftonly') : '') . ' valignmiddle' . ($morecss ? ' ' . $morecss : '') . '" style="' . ($fasize ? ('font-size: ' . $fasize . ';') : '') . ($facolor ? (' color: ' . $facolor . ';') : '') . '" alt="' . dol_escape_htmltag($titlealt) . '"' . (($notitle || empty($title)) ? '' : ' title="' . dol_escape_htmltag($title) . '"') . ($moreatt ? ' ' . $moreatt : '') . '>';

+                $enabledisablehtml = '<span class="fa '.$fakey.' '.($marginleftonlyshort ? ($marginleftonlyshort == 1 ? 'marginleftonlyshort' : 'marginleftonly') : '').' valignmiddle'.($morecss ? ' '.$morecss : '').'" style="'.($fasize ? ('font-size: '.$fasize.';') : '').($facolor ? (' color: '.$facolor.';') : '').'" alt="'.dol_escape_htmltag($titlealt).'"'.(($notitle || empty($title)) ? '' : ' title="'.dol_escape_htmltag($title).'"').($moreatt ? ' '.$moreatt : '').'>';

                 if (!empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {

                     $enabledisablehtml .= $titlealt;

                 }

@@ -3030,11 +3030,11 @@ 
             }

 

             if (!empty(Globals::$conf->global->MAIN_OVERWRITE_THEME_PATH)) {

-                $path = Globals::$conf->global->MAIN_OVERWRITE_THEME_PATH . '/theme/' . $theme; // If the theme does not have the same name as the module

+                $path = Globals::$conf->global->MAIN_OVERWRITE_THEME_PATH.'/theme/'.$theme; // If the theme does not have the same name as the module

             } else if (!empty(Globals::$conf->global->MAIN_OVERWRITE_THEME_RES)) {

-                $path = Globals::$conf->global->MAIN_OVERWRITE_THEME_RES . '/theme/' . Globals::$conf->global->MAIN_OVERWRITE_THEME_RES;  // To allow an external module to overwrite image resources whatever is activated theme

+                $path = Globals::$conf->global->MAIN_OVERWRITE_THEME_RES.'/theme/'.Globals::$conf->global->MAIN_OVERWRITE_THEME_RES; // To allow an external module to overwrite image resources whatever is activated theme

             } else if (!empty(Globals::$conf->modules_parts['theme']) && array_key_exists($theme, Globals::$conf->modules_parts['theme'])) {

-                $path = $theme . '/theme/' . $theme; // If the theme have the same name as the module

+                $path = $theme.'/theme/'.$theme; // If the theme have the same name as the module

             }

 

 // If we ask an image into $url/$mymodule/img (instead of default path)

@@ -3054,15 +3054,15 @@ 
                     continue;

                 }

 // This need a lot of time, that's why enabling alternative dir like "custom" dir is not recommanded

-                if (file_exists($dirroot . '/' . $path . '/img/' . $picto)) {

+                if (file_exists($dirroot.'/'.$path.'/img/'.$picto)) {

                     //$url = DOL_BASE_URI . Globals::$conf->file->dol_url_root[$type];

-                    $url = DOL_BASE_URI . Globals::$conf->file->dol_url_root[$type];

+                    $url = DOL_BASE_URI.Globals::$conf->file->dol_url_root[$type];

                     break;

                 }

             }

 

 // $url is '' or '/custom', $path is current theme or

-            $fullpathpicto = $url . '/' . $path . '/img/' . $picto;

+            $fullpathpicto = $url.'/'.$path.'/img/'.$picto;

         }

 

         if ($srconly) {

@@ -3070,7 +3070,7 @@ 
         }

 

 // tag title is used for tooltip on <a>, tag alt can be used with very simple text on image for bind people

-        return '<img src="' . $fullpathpicto . '" alt="' . dol_escape_htmltag($alt) . '"' . (($notitle || empty($titlealt)) ? '' : ' title="' . dol_escape_htmltag($titlealt) . '"') . ($moreatt ? ' ' . $moreatt : ' class="inline-block' . ($morecss ? ' ' . $morecss : '') . '"') . '>'; // Alt is used for accessibility, title for popup

+        return '<img src="'.$fullpathpicto.'" alt="'.dol_escape_htmltag($alt).'"'.(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt : ' class="inline-block'.($morecss ? ' '.$morecss : '').'"').'>'; // Alt is used for accessibility, title for popup

     }

 

     /**

@@ -3088,7 +3088,7 @@ 
      */

     static function img_object($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $srconly = 0, $notitle = 0)

     {

-        return img_picto($titlealt, 'object_' . $picto, $moreatt, $pictoisfullpath, $srconly, $notitle);

+        return img_picto($titlealt, 'object_'.$picto, $moreatt, $pictoisfullpath, $srconly, $notitle);

     }

 

     /**

@@ -3109,7 +3109,7 @@ 
             $picto .= '.png';

 

 //$path = DOL_BASE_URI . '/theme/' . Globals::$conf->theme . '/img/weather/' . $picto;

-        $path = DOL_BASE_URI . '/theme/' . Globals::$conf->theme . '/img/weather/' . $picto;

+        $path = DOL_BASE_URI.'/theme/'.Globals::$conf->theme.'/img/weather/'.$picto;

 

         return img_picto($titlealt, $path, $moreatt, 1);

     }

@@ -3135,10 +3135,10 @@ 
             $path = $picto;

         else {

 //$path = DOL_BASE_URI . '/theme/common/' . $picto;

-            $path = DOL_BASE_URI . '/theme/common/' . $picto;

+            $path = DOL_BASE_URI.'/theme/common/'.$picto;

 

             if (!empty(Globals::$conf->global->MAIN_MODULE_CAN_OVERWRITE_COMMONICONS)) {

-                $themepath = DOL_BASE_PATH . 'theme/' . Globals::$conf->theme . '/img/' . $picto;

+                $themepath = DOL_BASE_PATH.'theme/'.Globals::$conf->theme.'/img/'.$picto;

 

                 if (file_exists($themepath))

                     $path = $themepath;

@@ -3176,14 +3176,14 @@ 
                 $numaction = 3;

                 $titlealt = $langs->transnoentitiesnoconv('ChangeContactDone');

             } else {

-                $titlealt = $langs->transnoentitiesnoconv('ChangeStatus ' . $numaction);

+                $titlealt = $langs->transnoentitiesnoconv('ChangeStatus '.$numaction);

                 $numaction = 0;

             }

         }

         if (!is_numeric($numaction))

             $numaction = 0;

 

-        return img_picto($titlealt, 'stcomm' . $numaction . '.png');

+        return img_picto($titlealt, 'stcomm'.$numaction.'.png');

     }

 

     /**

@@ -3200,7 +3200,7 @@ 
         if ($titlealt == 'default')

             $titlealt = $langs->trans('Show');

 

-        return img_picto($titlealt, 'pdf' . $size . '.png');

+        return img_picto($titlealt, 'pdf'.$size.'.png');

     }

 

     /**

@@ -3252,7 +3252,7 @@ 
         if ($titlealt == 'default')

             $titlealt = $langs->trans('Modify');

 

-        return img_picto($titlealt, 'edit.png', ($float ? 'style="float: ' . ($langs->tab_translate["DIRECTION"] == 'rtl' ? 'left' : 'right') . '"' : "") . ($other ? ' ' . $other : ''));

+        return img_picto($titlealt, 'edit.png', ($float ? 'style="float: '.($langs->tab_translate["DIRECTION"] == 'rtl' ? 'left' : 'right').'"' : "").($other ? ' '.$other : ''));

     }

 

     /**

@@ -3270,7 +3270,7 @@ 
         if ($titlealt == 'default')

             $titlealt = $langs->trans('View');

 

-        $moreatt = ($float ? 'style="float: right" ' : '') . $other;

+        $moreatt = ($float ? 'style="float: right" ' : '').$other;

 

         return img_picto($titlealt, 'view.png', $moreatt);

     }

@@ -3343,7 +3343,7 @@ 
                 $usealttitle = $langs->trans('Info');

         }

 

-        return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;' . ($usehelpcursor == 1 ? ' cursor: help' : ($usehelpcursor == 2 ? ' cursor: pointer' : '')) . '"');

+        return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;'.($usehelpcursor == 1 ? ' cursor: help' : ($usehelpcursor == 2 ? ' cursor: pointer' : '')).'"');

     }

 

     /**

@@ -3377,7 +3377,7 @@ 
             $titlealt = $langs->trans('Warning');

 

 //return '<div class="imglatecoin">'.img_picto($titlealt, 'warning_white.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt): '')).'</div>';

-        return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"' . ($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' ' . $moreatt) : ''));

+        return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt) : ''));

     }

 

     /**

@@ -3411,7 +3411,7 @@ 
             $titlealt = $langs->trans('Next');

 

 //return img_picto($titlealt, 'next.png', $moreatt);

-        return '<span class="fa fa-chevron-right paddingright paddingleft" title="' . dol_escape_htmltag($titlealt) . '"></span>';

+        return '<span class="fa fa-chevron-right paddingright paddingleft" title="'.dol_escape_htmltag($titlealt).'"></span>';

     }

 

     /**

@@ -3429,7 +3429,7 @@ 
             $titlealt = $langs->trans('Previous');

 

 //return img_picto($titlealt, 'previous.png', $moreatt);

-        return '<span class="fa fa-chevron-left paddingright paddingleft" title="' . dol_escape_htmltag($titlealt) . '"></span>';

+        return '<span class="fa fa-chevron-left paddingright paddingleft" title="'.dol_escape_htmltag($titlealt).'"></span>';

     }

 

     /**

@@ -3447,7 +3447,7 @@ 
         if ($titlealt == 'default')

             $titlealt = $langs->trans('Down');

 

-        return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown' . ($moreclass ? " " . $moreclass : "") . '"');

+        return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown'.($moreclass ? " ".$moreclass : "").'"');

     }

 

     /**

@@ -3465,7 +3465,7 @@ 
         if ($titlealt == 'default')

             $titlealt = $langs->trans('Up');

 

-        return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup' . ($moreclass ? " " . $moreclass : "") . '"');

+        return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup'.($moreclass ? " ".$moreclass : "").'"');

     }

 

     /**

@@ -3548,7 +3548,7 @@ 
             $brand = 'credit-card';

         }

 

-        return '<span class="fa fa-' . $brand . ' fa-2x fa-fw"></span>';

+        return '<span class="fa fa-'.$brand.' fa-2x fa-fw"></span>';

     }

 

     /**

@@ -3561,17 +3561,17 @@ 
      */

     static function img_mime($file, $titlealt = '', $morecss = '')

     {

-        require_once DOL_BASE_PATH . '/core/lib/files.lib.php';

+        require_once DOL_BASE_PATH.'/core/lib/files.lib.php';

 

         $mimetype = dol_mimetype($file, '', 1);

         $mimeimg = dol_mimetype($file, '', 2);

         $mimefa = dol_mimetype($file, '', 4);

 

         if (empty($titlealt))

-            $titlealt = 'Mime type: ' . $mimetype;

+            $titlealt = 'Mime type: '.$mimetype;

 

 //return img_picto_common($titlealt, 'mime/'.$mimeimg, 'class="'.$morecss.'"');

-        return '<i class="fa fa-' . $mimefa . ' paddingright"></i>';

+        return '<i class="fa fa-'.$mimefa.' paddingright"></i>';

     }

 

     /**

@@ -3586,7 +3586,7 @@ 
      */

     static function img_phone($titlealt = 'default', $option = 0)

     {

-        dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);

+        dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);

 

        // global Globals::$conf, $langs;

 

@@ -3617,8 +3617,8 @@ 
 

         $img = img_picto($titlealt, 'search.png', $other, false, 1);

 

-        $input = '<input type="image" class="liste_titre" name="button_search" src="' . $img . '" ';

-        $input .= 'value="' . dol_escape_htmltag($titlealt) . '" title="' . dol_escape_htmltag($titlealt) . '" >';

+        $input = '<input type="image" class="liste_titre" name="button_search" src="'.$img.'" ';

+        $input .= 'value="'.dol_escape_htmltag($titlealt).'" title="'.dol_escape_htmltag($titlealt).'" >';

 

         return $input;

     }

@@ -3639,8 +3639,8 @@ 
 

         $img = img_picto($titlealt, 'searchclear.png', $other, false, 1);

 

-        $input = '<input type="image" class="liste_titre" name="button_removefilter" src="' . $img . '" ';

-        $input .= 'value="' . dol_escape_htmltag($titlealt) . '" title="' . dol_escape_htmltag($titlealt) . '" >';

+        $input = '<input type="image" class="liste_titre" name="button_removefilter" src="'.$img.'" ';

+        $input .= 'value="'.dol_escape_htmltag($titlealt).'" title="'.dol_escape_htmltag($titlealt).'" >';

 

         return $input;

     }

@@ -3660,10 +3660,10 @@ 
        // global Globals::$conf, $langs;

 

         if ($infoonimgalt) {

-            return img_picto($text, 'info', 'class="hideonsmartphone' . ($morecss ? ' ' . $morecss : '') . '"');

+            return img_picto($text, 'info', 'class="hideonsmartphone'.($morecss ? ' '.$morecss : '').'"');

         }

 

-        return ($nodiv ? '' : '<div class="' . (empty($admin) ? '' : ($admin == '1' ? 'info' : $admin)) . ' hideonsmartphone' . ($morecss ? ' ' . $morecss : '') . '">') . '<span class="fa fa-info-circle" title="' . dol_escape_htmltag($admin ? $langs->trans('InfoAdmin') : $langs->trans('Note')) . '"></span> ' . $text . ($nodiv ? '' : '</div>');

+        return ($nodiv ? '' : '<div class="'.(empty($admin) ? '' : ($admin == '1' ? 'info' : $admin)).' hideonsmartphone'.($morecss ? ' '.$morecss : '').'">').'<span class="fa fa-info-circle" title="'.dol_escape_htmltag($admin ? $langs->trans('InfoAdmin') : $langs->trans('Note')).'"></span> '.$text.($nodiv ? '' : '</div>');

     }

 

     /**

@@ -3688,7 +3688,7 @@ 
 

 // Si erreur intervenue avant chargement langue

         if (!$langs) {

-            require_once DOL_BASE_PATH . '/core/class/translate.class.php';

+            require_once DOL_BASE_PATH.'/core/class/translate.class.php';

             $langs = new Translate('', Globals::$conf);

             $langs->load("main");

         }

@@ -3696,51 +3696,51 @@ 
         $langs->loadLangs(array('main', 'errors'));

 

         if ($_SERVER['DOCUMENT_ROOT']) {    // Mode web

-            $out .= $langs->trans("DolibarrHasDetectedError") . ".<br>\n";

+            $out .= $langs->trans("DolibarrHasDetectedError").".<br>\n";

             if (!empty(Globals::$conf->global->MAIN_FEATURES_LEVEL))

                 $out .= "You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";

-            $out .= $langs->trans("InformationToHelpDiagnose") . ":<br>\n";

+            $out .= $langs->trans("InformationToHelpDiagnose").":<br>\n";

 

-            $out .= "<b>" . $langs->trans("Date") . ":</b> " . dol_print_date(time(), 'dayhourlog') . "<br>\n";

-            $out .= "<b>" . $langs->trans("Dolibarr") . ":</b> " . DOL_VERSION . "<br>\n";

+            $out .= "<b>".$langs->trans("Date").":</b> ".dol_print_date(time(), 'dayhourlog')."<br>\n";

+            $out .= "<b>".$langs->trans("Dolibarr").":</b> ".DOL_VERSION."<br>\n";

             if (isset(Globals::$conf->global->MAIN_FEATURES_LEVEL))

-                $out .= "<b>" . $langs->trans("LevelOfFeature") . ":</b> " . Globals::$conf->global->MAIN_FEATURES_LEVEL . "<br>\n";

+                $out .= "<b>".$langs->trans("LevelOfFeature").":</b> ".Globals::$conf->global->MAIN_FEATURES_LEVEL."<br>\n";

             if (function_exists("phpversion")) {

-                $out .= "<b>" . $langs->trans("PHP") . ":</b> " . phpversion() . "<br>\n";

+                $out .= "<b>".$langs->trans("PHP").":</b> ".phpversion()."<br>\n";

             }

-            $out .= "<b>" . $langs->trans("Server") . ":</b> " . $_SERVER["SERVER_SOFTWARE"] . "<br>\n";

+            $out .= "<b>".$langs->trans("Server").":</b> ".$_SERVER["SERVER_SOFTWARE"]."<br>\n";

             if (function_exists("php_uname")) {

-                $out .= "<b>" . $langs->trans("OS") . ":</b> " . php_uname() . "<br>\n";

+                $out .= "<b>".$langs->trans("OS").":</b> ".php_uname()."<br>\n";

             }

-            $out .= "<b>" . $langs->trans("UserAgent") . ":</b> " . $_SERVER["HTTP_USER_AGENT"] . "<br>\n";

+            $out .= "<b>".$langs->trans("UserAgent").":</b> ".$_SERVER["HTTP_USER_AGENT"]."<br>\n";

             $out .= "<br>\n";

-            $out .= "<b>" . $langs->trans("RequestedUrl") . ":</b> " . dol_htmlentities($_SERVER["REQUEST_URI"], ENT_COMPAT, 'UTF-8') . "<br>\n";

-            $out .= "<b>" . $langs->trans("Referer") . ":</b> " . (isset($_SERVER["HTTP_REFERER"]) ? dol_htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT, 'UTF-8') : '') . "<br>\n";

-            $out .= "<b>" . $langs->trans("MenuManager") . ":</b> " . (isset(Globals::$conf->standard_menu) ? Globals::$conf->standard_menu : '') . "<br>\n";

+            $out .= "<b>".$langs->trans("RequestedUrl").":</b> ".dol_htmlentities($_SERVER["REQUEST_URI"], ENT_COMPAT, 'UTF-8')."<br>\n";

+            $out .= "<b>".$langs->trans("Referer").":</b> ".(isset($_SERVER["HTTP_REFERER"]) ? dol_htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT, 'UTF-8') : '')."<br>\n";

+            $out .= "<b>".$langs->trans("MenuManager").":</b> ".(isset(Globals::$conf->standard_menu) ? Globals::$conf->standard_menu : '')."<br>\n";

             $out .= "<br>\n";

-            $syslog .= "url=" . dol_escape_htmltag($_SERVER["REQUEST_URI"]);

-            $syslog .= ", query_string=" . dol_escape_htmltag($_SERVER["QUERY_STRING"]);

+            $syslog .= "url=".dol_escape_htmltag($_SERVER["REQUEST_URI"]);

+            $syslog .= ", query_string=".dol_escape_htmltag($_SERVER["QUERY_STRING"]);

         } else {                              // Mode CLI

-            $out .= '> ' . $langs->transnoentities("ErrorInternalErrorDetected") . ":\n" . $argv[0] . "\n";

-            $syslog .= "pid=" . dol_getmypid();

+            $out .= '> '.$langs->transnoentities("ErrorInternalErrorDetected").":\n".$argv[0]."\n";

+            $syslog .= "pid=".dol_getmypid();

         }

 

         if (is_object($db)) {

             if ($_SERVER['DOCUMENT_ROOT']) {  // Mode web

-                $out .= "<b>" . $langs->trans("DatabaseTypeManager") . ":</b> " . $db->type . "<br>\n";

-                $out .= "<b>" . $langs->trans("RequestLastAccessInError") . ":</b> " . ($db->lastqueryerror() ? dol_escape_htmltag($db->lastqueryerror()) : $langs->trans("ErrorNoRequestInError")) . "<br>\n";

-                $out .= "<b>" . $langs->trans("ReturnCodeLastAccessInError") . ":</b> " . ($db->lasterrno() ? dol_escape_htmltag($db->lasterrno()) : $langs->trans("ErrorNoRequestInError")) . "<br>\n";

-                $out .= "<b>" . $langs->trans("InformationLastAccessInError") . ":</b> " . ($db->lasterror() ? dol_escape_htmltag($db->lasterror()) : $langs->trans("ErrorNoRequestInError")) . "<br>\n";

+                $out .= "<b>".$langs->trans("DatabaseTypeManager").":</b> ".$db->type."<br>\n";

+                $out .= "<b>".$langs->trans("RequestLastAccessInError").":</b> ".($db->lastqueryerror() ? dol_escape_htmltag($db->lastqueryerror()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";

+                $out .= "<b>".$langs->trans("ReturnCodeLastAccessInError").":</b> ".($db->lasterrno() ? dol_escape_htmltag($db->lasterrno()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";

+                $out .= "<b>".$langs->trans("InformationLastAccessInError").":</b> ".($db->lasterror() ? dol_escape_htmltag($db->lasterror()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";

                 $out .= "<br>\n";

             } else {                            // Mode CLI

 // No dol_escape_htmltag for output, we are in CLI mode

-                $out .= '> ' . $langs->transnoentities("DatabaseTypeManager") . ":\n" . $db->type . "\n";

-                $out .= '> ' . $langs->transnoentities("RequestLastAccessInError") . ":\n" . ($db->lastqueryerror() ? $db->lastqueryerror() : $langs->transnoentities("ErrorNoRequestInError")) . "\n";

-                $out .= '> ' . $langs->transnoentities("ReturnCodeLastAccessInError") . ":\n" . ($db->lasterrno() ? $db->lasterrno() : $langs->transnoentities("ErrorNoRequestInError")) . "\n";

-                $out .= '> ' . $langs->transnoentities("InformationLastAccessInError") . ":\n" . ($db->lasterror() ? $db->lasterror() : $langs->transnoentities("ErrorNoRequestInError")) . "\n";

+                $out .= '> '.$langs->transnoentities("DatabaseTypeManager").":\n".$db->type."\n";

+                $out .= '> '.$langs->transnoentities("RequestLastAccessInError").":\n".($db->lastqueryerror() ? $db->lastqueryerror() : $langs->transnoentities("ErrorNoRequestInError"))."\n";

+                $out .= '> '.$langs->transnoentities("ReturnCodeLastAccessInError").":\n".($db->lasterrno() ? $db->lasterrno() : $langs->transnoentities("ErrorNoRequestInError"))."\n";

+                $out .= '> '.$langs->transnoentities("InformationLastAccessInError").":\n".($db->lasterror() ? $db->lasterror() : $langs->transnoentities("ErrorNoRequestInError"))."\n";

             }

-            $syslog .= ", sql=" . $db->lastquery();

-            $syslog .= ", db_error=" . $db->lasterror();

+            $syslog .= ", sql=".$db->lastquery();

+            $syslog .= ", db_error=".$db->lasterror();

         }

 

         if ($error || $errors) {

@@ -3760,31 +3760,31 @@ 
                 if (empty($msg))

                     continue;

                 if ($_SERVER['DOCUMENT_ROOT']) {  // Mode web

-                    $out .= "<b>" . $langs->trans("Message") . ":</b> " . dol_escape_htmltag($msg) . "<br>\n";

+                    $out .= "<b>".$langs->trans("Message").":</b> ".dol_escape_htmltag($msg)."<br>\n";

                 } else {                        // Mode CLI

-                    $out .= '> ' . $langs->transnoentities("Message") . ":\n" . $msg . "\n";

+                    $out .= '> '.$langs->transnoentities("Message").":\n".$msg."\n";

                 }

-                $syslog .= ", msg=" . $msg;

+                $syslog .= ", msg=".$msg;

             }

         }

         if (empty($dolibarr_main_prod) && $_SERVER['DOCUMENT_ROOT'] && function_exists('xdebug_print_function_stack') && function_exists('xdebug_call_file')) {

             xdebug_print_function_stack();

-            $out .= '<b>XDebug informations:</b>' . "<br>\n";

-            $out .= 'File: ' . xdebug_call_file() . "<br>\n";

-            $out .= 'Line: ' . xdebug_call_line() . "<br>\n";

-            $out .= 'Function: ' . xdebug_call_function() . "<br>\n";

+            $out .= '<b>XDebug informations:</b>'."<br>\n";

+            $out .= 'File: '.xdebug_call_file()."<br>\n";

+            $out .= 'Line: '.xdebug_call_line()."<br>\n";

+            $out .= 'Function: '.xdebug_call_function()."<br>\n";

             $out .= "<br>\n";

         }

 

         if (empty($dolibarr_main_prod))

             print $out;

         else {

-            print $langs->trans("DolibarrHasDetectedError") . '. ';

+            print $langs->trans("DolibarrHasDetectedError").'. ';

             print $langs->trans("YouCanSetOptionDolibarrMainProdToZero");

             define("MAIN_CORE_ERROR", 1);

         }

 //else print 'Sorry, an error occured but the parameter $dolibarr_main_prod is defined in conf file so no message is reported to your browser. Please read the log file for error message.';

-        dol_syslog("Error " . $syslog, LOG_ERR);

+        dol_syslog("Error ".$syslog, LOG_ERR);

     }

 

     /**

@@ -3807,13 +3807,13 @@ 
         $langs->load("errors");

         $now = dol_now();

 

-        print '<br><div class="center login_main_message"><div class="' . $morecss . '">';

-        print $langs->trans("ErrorContactEMail", $email, $prefixcode . dol_print_date($now, '%Y%m%d'));

+        print '<br><div class="center login_main_message"><div class="'.$morecss.'">';

+        print $langs->trans("ErrorContactEMail", $email, $prefixcode.dol_print_date($now, '%Y%m%d'));

         if ($errormessage)

-            print '<br><br>' . $errormessage;

+            print '<br><br>'.$errormessage;

         if (is_array($errormessages) && count($errormessages)) {

             foreach ($errormessages as $mesgtoshow) {

-                print '<br><br>' . $mesgtoshow;

+                print '<br><br>'.$mesgtoshow;

             }

         }

         print '</div></div>';

@@ -3871,16 +3871,16 @@ 
         }

 

         $tmpsortfield = explode(',', $sortfield);

-        $sortfield1 = trim($tmpsortfield[0]);    // If $sortfield is 'd.datep,d.id', it becomes 'd.datep'

+        $sortfield1 = trim($tmpsortfield[0]); // If $sortfield is 'd.datep,d.id', it becomes 'd.datep'

         $tmpfield = explode(',', $field);

-        $field1 = trim($tmpfield[0]);            // If $field is 'd.datep,d.id', it becomes 'd.datep'

+        $field1 = trim($tmpfield[0]); // If $field is 'd.datep,d.id', it becomes 'd.datep'

 //var_dump('field='.$field.' field1='.$field1.' sortfield='.$sortfield.' sortfield1='.$sortfield1);

 // If field is used as sort criteria we use a specific css class liste_titre_sel

 // Example if (sortfield,field)=("nom","xxx.nom") or (sortfield,field)=("nom","nom")

         if ($field1 && ($sortfield1 == $field1 || $sortfield1 == preg_replace("/^[^\.]+\./", "", $field1))) {

-            $out .= '<' . $tag . ' class="' . $prefix . 'liste_titre_sel" ' . $moreattrib . '>';

+            $out .= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '.$moreattrib.'>';

         } else {

-            $out .= '<' . $tag . ' class="' . $prefix . 'liste_titre" ' . $moreattrib . '>';

+            $out .= '<'.$tag.' class="'.$prefix.'liste_titre" '.$moreattrib.'>';

         }

 

         if (empty($thead) && $field && empty($disablesortlink)) {    // If this is a sort field

@@ -3888,7 +3888,7 @@ 
             $options = preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i', '', $options);

             $options = preg_replace('/&+/i', '&', $options);

             if (!preg_match('/^&/', $options)) {

-                $options = '&' . $options;

+                $options = '&'.$options;

             }

 

             $sortordertouseinlink = '';

@@ -3906,7 +3906,7 @@ 
                 }

             }

             $sortordertouseinlink = preg_replace('/,$/', '', $sortordertouseinlink);

-            $out .= '<a class="reposition" href="' . $file . '?sortfield=' . $field . '&sortorder=' . $sortordertouseinlink . '&begin=' . $begin . $options . '">';

+            $out .= '<a class="reposition" href="'.$file.'?sortfield='.$field.'&sortorder='.$sortordertouseinlink.'&begin='.$begin.$options.'">';

         }

 

         if ($tooltip) {

@@ -3924,7 +3924,7 @@ 
             $options = preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i', '', $options);

             $options = preg_replace('/&+/i', '&', $options);

             if (!preg_match('/^&/', $options)) {

-                $options = '&' . $options;

+                $options = '&'.$options;

             }

 

             if (!$sortorder || $field1 != $sortfield1) {

@@ -3934,19 +3934,19 @@ 
                 if (preg_match('/^DESC/', $sortorder)) {

                     //$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",0).'</a>';

                     //$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",1).'</a>';

-                    $sortimg .= '<span class="nowrap">' . img_up("Z-A", 0) . '</span>';

+                    $sortimg .= '<span class="nowrap">'.img_up("Z-A", 0).'</span>';

                 }

                 if (preg_match('/^ASC/', $sortorder)) {

                     //$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",1).'</a>';

                     //$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",0).'</a>';

-                    $sortimg .= '<span class="nowrap">' . img_down("A-Z", 0) . '</span>';

+                    $sortimg .= '<span class="nowrap">'.img_down("A-Z", 0).'</span>';

                 }

             }

         }

 

         $out .= $sortimg;

 

-        $out .= '</' . $tag . '>';

+        $out .= '</'.$tag.'>';

 

         return $out;

     }

@@ -3961,9 +3961,9 @@ 
      */

     static function print_titre($title)

     {

-        dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);

+        dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);

 

-        print '<div class="titre">' . $title . '</div>';

+        print '<div class="titre">'.$title.'</div>';

     }

 

     /**

@@ -4006,20 +4006,20 @@ 
         }

 

         $return .= "\n";

-        $return .= '<table ' . ($id ? 'id="' . $id . '" ' : '') . 'summary="" class="centpercent notopnoleftnoright' . ($morecssontable ? ' ' . $morecssontable : '') . '" style="margin-bottom: 6px;"><tr>'; // maring bottom must be same than into print_barre_list

+        $return .= '<table '.($id ? 'id="'.$id.'" ' : '').'summary="" class="centpercent notopnoleftnoright'.($morecssontable ? ' '.$morecssontable : '').'" style="margin-bottom: 6px;"><tr>'; // maring bottom must be same than into print_barre_list

         if ($picto) {

-            $return .= '<td class="nobordernopadding widthpictotitle opacityhigh" valign="middle">' . img_picto('', $picto, 'class="valignmiddle widthpictotitle pictotitle"', $pictoisfullpath) . '</td>';

+            $return .= '<td class="nobordernopadding widthpictotitle opacityhigh" valign="middle">'.img_picto('', $picto, 'class="valignmiddle widthpictotitle pictotitle"', $pictoisfullpath).'</td>';

         }

         $return .= '<td class="nobordernopadding valignmiddle">';

-        $return .= '<div class="titre inline-block">' . $titre . '</div>';

+        $return .= '<div class="titre inline-block">'.$titre.'</div>';

         $return .= '</td>';

         if (dol_strlen($morehtmlcenter)) {

-            $return .= '<td class="nobordernopadding" align="center" valign="middle">' . $morehtmlcenter . '</td>';

+            $return .= '<td class="nobordernopadding" align="center" valign="middle">'.$morehtmlcenter.'</td>';

         }

         if (dol_strlen($morehtmlright)) {

-            $return .= '<td class="nobordernopadding titre_right wordbreak" align="right" valign="middle">' . $morehtmlright . '</td>';

+            $return .= '<td class="nobordernopadding titre_right wordbreak" align="right" valign="middle">'.$morehtmlright.'</td>';

         }

-        $return .= '</tr></table>' . "\n";

+        $return .= '</tr></table>'."\n";

 

         return $return;

     }

@@ -4067,29 +4067,29 @@ 
 //print 'totalnboflines='.$totalnboflines.'-savlimit='.$savlimit.'-limit='.$limit.'-num='.$num.'-nextpage='.$nextpage;

 

         print "\n";

-        print "<!-- Begin title '" . $titre . "' -->\n";

-        print '<table border="0" class="centpercent notopnoleftnoright' . ($morecss ? ' ' . $morecss : '') . '" style="margin-bottom: 6px;"><tr>'; // maring bottom must be same than into load_fiche_tire

+        print "<!-- Begin title '".$titre."' -->\n";

+        print '<table border="0" class="centpercent notopnoleftnoright'.($morecss ? ' '.$morecss : '').'" style="margin-bottom: 6px;"><tr>'; // maring bottom must be same than into load_fiche_tire

 // Left

 //if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, 'id="pictotitle"', $pictoisfullpath).'</td>';

         print '<td class="nobordernopadding valignmiddle">';

         if ($picto && $titre)

             print img_picto('', $picto, 'class="hideonsmartphone valignmiddle opacityhigh pictotitle widthpictotitle"', $pictoisfullpath);

-        print '<div class="titre inline-block">' . $titre;

+        print '<div class="titre inline-block">'.$titre;

         if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '')

-            print ' (' . $totalnboflines . ')';

+            print ' ('.$totalnboflines.')';

         print '</div></td>';

 

 // Center

         if ($morehtmlcenter) {

-            print '<td class="nobordernopadding center valignmiddle">' . $morehtmlcenter . '</td>';

+            print '<td class="nobordernopadding center valignmiddle">'.$morehtmlcenter.'</td>';

         }

 

 // Right

         print '<td class="nobordernopadding valignmiddle" align="right">';

         if ($sortfield)

-            $options .= "&sortfield=" . urlencode($sortfield);

+            $options .= "&sortfield=".urlencode($sortfield);

         if ($sortorder)

-            $options .= "&sortorder=" . urlencode($sortorder);

+            $options .= "&sortorder=".urlencode($sortorder);

 // Show navigation bar

         $pagelist = '';

         if ($savlimit != 0 && ($page > 0 || $num > $limit)) {

@@ -4107,40 +4107,40 @@ 
                 }

 

                 if ($cpt >= 1) {

-                    $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=0' . $options . '">1</a></li>';

+                    $pagelist .= '<li'.((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><a href="'.$file.'?page=0'.$options.'">1</a></li>';

                     if ($cpt > 2)

-                        $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';

+                        $pagelist .= '<li'.((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><span '.((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '').'>...</span></li>';

                     else if ($cpt == 2)

-                        $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=1' . $options . '">2</a></li>';

+                        $pagelist .= '<li'.((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><a href="'.$file.'?page=1'.$options.'">2</a></li>';

                 }

 

                 do {

                     if ($cpt == $page) {

-                        $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="active"' : '') . '>' . ($page + 1) . '</span></li>';

+                        $pagelist .= '<li'.((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><span '.((Globals::$conf->dol_use_jmobile != 4) ? 'class="active"' : '').'>'.($page + 1).'</span></li>';

                     } else {

-                        $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . $cpt . $options . '">' . ($cpt + 1) . '</a></li>';

+                        $pagelist .= '<li'.((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><a href="'.$file.'?page='.$cpt.$options.'">'.($cpt + 1).'</a></li>';

                     }

                     $cpt++;

                 } while ($cpt < $nbpages && $cpt <= $page + $maxnbofpage);

 

                 if ($cpt < $nbpages) {

                     if ($cpt < $nbpages - 2)

-                        $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';

+                        $pagelist .= '<li'.((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><span '.((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '').'>...</span></li>';

                     else if ($cpt == $nbpages - 2)

-                        $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 2) . $options . '">' . ($nbpages - 1) . '</a></li>';

-                    $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 1) . $options . '">' . $nbpages . '</a></li>';

+                        $pagelist .= '<li'.((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><a href="'.$file.'?page='.($nbpages - 2).$options.'">'.($nbpages - 1).'</a></li>';

+                    $pagelist .= '<li'.((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><a href="'.$file.'?page='.($nbpages - 1).$options.'">'.$nbpages.'</a></li>';

                 }

             }

             else {

-                $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="active"' : '') . '>' . ($page + 1) . "</li>";

+                $pagelist .= '<li'.((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><span '.((Globals::$conf->dol_use_jmobile != 4) ? 'class="active"' : '').'>'.($page + 1)."</li>";

             }

         }

 

-        print_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtmlright, $savlimit, $totalnboflines, $hideselectlimit);  // output the div and ul for previous/last completed with page numbers into $pagelist

+        print_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtmlright, $savlimit, $totalnboflines, $hideselectlimit); // output the div and ul for previous/last completed with page numbers into $pagelist

 

         print '</td>';

 

-        print '</tr></table>' . "\n";

+        print '</tr></table>'."\n";

         print "<!-- End title -->\n\n";

     }

 

@@ -4171,12 +4171,12 @@ 
                 $pagesizechoices = Globals::$conf->global->MAIN_PAGESIZE_CHOICES;

 

             print '<li class="pagination">';

-            print '<select class="flat selectlimit" name="limit" title="' . dol_escape_htmltag($langs->trans("MaxNbOfRecordPerPage")) . '">';

+            print '<select class="flat selectlimit" name="limit" title="'.dol_escape_htmltag($langs->trans("MaxNbOfRecordPerPage")).'">';

             $tmpchoice = explode(',', $pagesizechoices);

-            $tmpkey = $limit . ':' . $limit;

+            $tmpkey = $limit.':'.$limit;

             if (!in_array($tmpkey, $tmpchoice))

                 $tmpchoice[] = $tmpkey;

-            $tmpkey = Globals::$conf->liste_limit . ':' . Globals::$conf->liste_limit;

+            $tmpkey = Globals::$conf->liste_limit.':'.Globals::$conf->liste_limit;

             if (!in_array($tmpkey, $tmpchoice))

                 $tmpchoice[] = $tmpkey;

             asort($tmpchoice, SORT_NUMERIC);

@@ -4191,7 +4191,7 @@ 
                         $selected = ' selected="selected"';

                         $found = true;

                     }

-                    print '<option name="' . $key . '"' . $selected . '>' . dol_escape_htmltag($val) . '</option>' . "\n";

+                    print '<option name="'.$key.'"'.$selected.'>'.dol_escape_htmltag($val).'</option>'."\n";

                 }

             }

             print '</select>';

@@ -4210,20 +4210,20 @@ 
             print '</li>';

         }

         if ($page > 0) {

-            print '<li class="pagination"><a class="paginationprevious" href="' . $file . '?page=' . ($page - 1) . $options . '"><i class="fa fa-chevron-left" title="' . dol_escape_htmltag($langs->trans("Previous")) . '"></i></a></li>';

+            print '<li class="pagination"><a class="paginationprevious" href="'.$file.'?page='.($page - 1).$options.'"><i class="fa fa-chevron-left" title="'.dol_escape_htmltag($langs->trans("Previous")).'"></i></a></li>';

         }

         if ($betweenarrows) {

             print $betweenarrows;

         }

         if ($nextpage > 0) {

-            print '<li class="pagination"><a class="paginationnext" href="' . $file . '?page=' . ($page + 1) . $options . '"><i class="fa fa-chevron-right" title="' . dol_escape_htmltag($langs->trans("Next")) . '"></i></a></li>';

+            print '<li class="pagination"><a class="paginationnext" href="'.$file.'?page='.($page + 1).$options.'"><i class="fa fa-chevron-right" title="'.dol_escape_htmltag($langs->trans("Next")).'"></i></a></li>';

         }

         if ($afterarrows) {

             print '<li class="paginationafterarrows">';

             print $afterarrows;

             print '</li>';

         }

-        print '</ul></div>' . "\n";

+        print '</ul></div>'."\n";

     }

 

     /**

@@ -4245,8 +4245,8 @@ 
             $addpercent = true;

         }

         if (preg_match('/\((.*)\)/', $rate, $reg)) {

-            $morelabel = ' (' . $reg[1] . ')';

-            $rate = preg_replace('/\s*' . preg_quote($morelabel, '/') . '/', '', $rate);

+            $morelabel = ' ('.$reg[1].')';

+            $rate = preg_replace('/\s*'.preg_quote($morelabel, '/').'/', '', $rate);

         }

         if (preg_match('/\*/', $rate)) {

             $rate = str_replace('*', '', $rate);

@@ -4255,10 +4255,10 @@ 
 

 // If rate is '9/9/9' we don't change it.  If rate is '9.000' we apply price()

         if (!preg_match('/\//', $rate))

-            $ret = price($rate, 0, '', 0, 0) . ($addpercent ? '%' : '');

+            $ret = price($rate, 0, '', 0, 0).($addpercent ? '%' : '');

         else {

 // TODO Split on / and output with a price2num to have clean numbers without ton of 000.

-            $ret = $rate . ($addpercent ? '%' : '');

+            $ret = $rate.($addpercent ? '%' : '');

         }

         if (($info_bits & 1) && $usestarfornpr >= 0)

             $ret .= ' *';

@@ -4351,10 +4351,10 @@ 
                 $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);

             else {

                 $tmpcur = $outlangs->getCurrencySymbol($currency_code);

-                $cursymbolafter .= ($tmpcur == $currency_code ? ' ' . $tmpcur : $tmpcur);

+                $cursymbolafter .= ($tmpcur == $currency_code ? ' '.$tmpcur : $tmpcur);

             }

         }

-        $output = $cursymbolbefore . $output . $end . ($cursymbolafter ? ' ' : '') . $cursymbolafter;

+        $output = $cursymbolbefore.$output.$end.($cursymbolafter ? ' ' : '').$cursymbolafter;

 

         return $output;

     }

@@ -4407,7 +4407,7 @@ 
 // Now make replace (the main goal of function)

             if ($thousand != ',' && $thousand != '.')

                 $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users

-            $amount = str_replace(' ', '', $amount);  // To avoid spaces

+            $amount = str_replace(' ', '', $amount); // To avoid spaces

             $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .

             $amount = str_replace($dec, '.', $amount);

         }

@@ -4436,14 +4436,14 @@ 
                 $temps = sprintf("%0.10F", $amount - intval($amount)); // temps=0.0000000000 or 0.0000200000 or 9999.1000000000

                 $temps = preg_replace('/([\.1-9])0+$/', '\\1', $temps); // temps=0. or 0.00002 or 9999.1

                 $nbofdec = max(0, dol_strlen($temps) - 2); // -2 to remove "0."

-                $amount = number_format($amount, min($nbofdec, $nbofdectoround), $dec, $thousand);  // Convert amount to format with dolibarr dec and thousand

+                $amount = number_format($amount, min($nbofdec, $nbofdectoround), $dec, $thousand); // Convert amount to format with dolibarr dec and thousand

             }

 //print "TT".$amount.'<br>';

 // Always make replace because each math static function (like round) replace

 // with local values and we want a number that has a SQL string format x.y

             if ($thousand != ',' && $thousand != '.')

                 $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users

-            $amount = str_replace(' ', '', $amount);  // To avoid spaces

+            $amount = str_replace(' ', '', $amount); // To avoid spaces

             $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .

             $amount = str_replace($dec, '.', $amount);

         }

@@ -4464,7 +4464,7 @@ 
      */

     static function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round = -1, $forceunitoutput = 'no')

     {

-        require_once DOL_BASE_PATH . '/core/lib/product.lib.php';

+        require_once DOL_BASE_PATH.'/core/lib/product.lib.php';

 

         if (($forceunitoutput == 'no' && $dimension < 1 / 10000) || (is_numeric($forceunitoutput) && $forceunitoutput == -6)) {

             $dimension = $dimension * 1000000;

@@ -4480,7 +4480,7 @@ 
             $unit = $unit + 3;

         }

 

-        $ret = price($dimension, 0, $outputlangs, 0, 0, $round) . ' ' . measuring_units_string($unit, $type);

+        $ret = price($dimension, 0, $outputlangs, 0, 0, $round).' '.measuring_units_string($unit, $type);

 

         return $ret;

     }

@@ -4504,7 +4504,7 @@ 
         if (empty($thirdparty_seller) || !is_object($thirdparty_seller))

             $thirdparty_seller = $mysoc;

 

-        dol_syslog("get_localtax tva=" . $vatrate . " local=" . $local . " thirdparty_buyer id=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->id : '') . "/country_code=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->country_code : '') . " thirdparty_seller id=" . $thirdparty_seller->id . "/country_code=" . $thirdparty_seller->country_code . " thirdparty_seller localtax1_assuj=" . $thirdparty_seller->localtax1_assuj . "  thirdparty_seller localtax2_assuj=" . $thirdparty_seller->localtax2_assuj);

+        dol_syslog("get_localtax tva=".$vatrate." local=".$local." thirdparty_buyer id=".(is_object($thirdparty_buyer) ? $thirdparty_buyer->id : '')."/country_code=".(is_object($thirdparty_buyer) ? $thirdparty_buyer->country_code : '')." thirdparty_seller id=".$thirdparty_seller->id."/country_code=".$thirdparty_seller->country_code." thirdparty_seller localtax1_assuj=".$thirdparty_seller->localtax1_assuj."  thirdparty_seller localtax2_assuj=".$thirdparty_seller->localtax2_assuj);

 

         $vatratecleaned = $vatrate;

         if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {      // If vat is "xx (yy)"

@@ -4535,7 +4535,7 @@ 
             if ($local == 2) {

 //if (! $mysoc->localtax2_assuj || (string) $vatratecleaned == "0") return 0;

                 if (!$mysoc->localtax2_assuj)

-                    return 0;  // If main vat is 0, IRPF may be different than 0.

+                    return 0; // If main vat is 0, IRPF may be different than 0.

                 if ($thirdparty_seller->id == $mysoc->id) {

                     if (!$thirdparty_buyer->localtax2_assuj)

                         return 0;

@@ -4589,13 +4589,13 @@ 
 

 // By default, search value of local tax on line of common tax

         $sql = "SELECT t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";

-        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $thirdparty_seller->country_code . "'";

-        $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";

+        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$thirdparty_seller->country_code."'";

+        $sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";

         if ($vatratecode)

-            $sql .= " AND t.code ='" . $vatratecode . "'";  // If we have the code, we use it in priority

+            $sql .= " AND t.code ='".$vatratecode."'"; // If we have the code, we use it in priority

         else

-            $sql .= " AND t.recuperableonly ='" . $vatnpr . "'";

+            $sql .= " AND t.recuperableonly ='".$vatnpr."'";

         dol_syslog("get_localtax", LOG_DEBUG);

         $resql = $db->query($sql);

 

@@ -4641,10 +4641,10 @@ 
     {

        // global $db, $mysoc;

         $sql = "SELECT t.localtax1, t.localtax2 ";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t inner join " . MAIN_DB_PREFIX . "c_country as c ON c.rowid=t.fk_pays";

-        $sql .= " WHERE c.code = '" . $mysoc->country_code . "' AND t.active = 1 AND t.taux=(";

-        $sql .= "  SELECT max(tt.taux) FROM " . MAIN_DB_PREFIX . "c_tva as tt inner join " . MAIN_DB_PREFIX . "c_country as c ON c.rowid=tt.fk_pays";

-        $sql .= "  WHERE c.code = '" . $mysoc->country_code . "' AND tt.active = 1";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=t.fk_pays";

+        $sql .= " WHERE c.code = '".$mysoc->country_code."' AND t.active = 1 AND t.taux=(";

+        $sql .= "  SELECT max(tt.taux) FROM ".MAIN_DB_PREFIX."c_tva as tt inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=tt.fk_pays";

+        $sql .= "  WHERE c.code = '".$mysoc->country_code."' AND tt.active = 1";

         $sql .= "  )";

 

         $resql = $db->query($sql);

@@ -4674,13 +4674,13 @@ 
     {

        // global $db, $mysoc;

 

-        dol_syslog("getTaxesFromId vat id or rate = " . $vatrate);

+        dol_syslog("getTaxesFromId vat id or rate = ".$vatrate);

 

 // Search local taxes

         $sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr, t.accountancy_code_sell, t.accountancy_code_buy";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";

         if ($firstparamisid)

-            $sql .= " WHERE t.rowid = " . (int) $vatrate;

+            $sql .= " WHERE t.rowid = ".(int) $vatrate;

         else {

             $vatratecleaned = $vatrate;

             $vatratecode = '';

@@ -4689,13 +4689,13 @@ 
                 $vatratecode = $reg[2];

             }

 

-            $sql .= ", " . MAIN_DB_PREFIX . "c_country as c";

+            $sql .= ", ".MAIN_DB_PREFIX."c_country as c";

             /* if ($mysoc->country_code == 'ES') $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'";    // vat in spain use the buyer country ??

               else $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'"; */

-            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";

-            $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

+            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";

+            $sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";

             if ($vatratecode)

-                $sql .= " AND t.code = '" . $vatratecode . "'";

+                $sql .= " AND t.code = '".$vatratecode."'";

         }

 

         $resql = $db->query($sql);

@@ -4731,13 +4731,13 @@ 
     {

        // global $db, $mysoc;

 

-        dol_syslog("getLocalTaxesFromRate vatrate=" . $vatrate . " local=" . $local);

+        dol_syslog("getLocalTaxesFromRate vatrate=".$vatrate." local=".$local);

 

 // Search local taxes

         $sql = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";

         if ($firstparamisid)

-            $sql .= " WHERE t.rowid = " . (int) $vatrate;

+            $sql .= " WHERE t.rowid = ".(int) $vatrate;

         else {

             $vatratecleaned = $vatrate;

             $vatratecode = '';

@@ -4746,14 +4746,14 @@ 
                 $vatratecode = $reg[2];

             }

 

-            $sql .= ", " . MAIN_DB_PREFIX . "c_country as c";

+            $sql .= ", ".MAIN_DB_PREFIX."c_country as c";

             if ($mysoc->country_code == 'ES')

-                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $buyer->country_code . "'";    // local tax in spain use the buyer country ??

+                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'"; // local tax in spain use the buyer country ??

             else

-                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";

-            $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

+                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";

+            $sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";

             if ($vatratecode)

-                $sql .= " AND t.code = '" . $vatratecode . "'";

+                $sql .= " AND t.code = '".$vatratecode."'";

         }

 

         $resql = $db->query($sql);

@@ -4785,7 +4785,7 @@ 
     {

        // global $db, Globals::$conf, $mysoc;

 

-        require_once DOL_BASE_PATH . '/product/class/product.class.php';

+        require_once DOL_BASE_PATH.'/product/class/product.class.php';

 

         $ret = 0;

         $found = 0;

@@ -4800,12 +4800,12 @@ 
                     $product->get_buyprice($idprodfournprice, 0, 0, 0);

                     $ret = $product->vatrate_supplier;

                     if ($product->default_vat_code)

-                        $ret .= ' (' . $product->default_vat_code . ')';

+                        $ret .= ' ('.$product->default_vat_code.')';

                 }

                 else {

-                    $ret = $product->tva_tx;    // Default vat of product we defined

+                    $ret = $product->tva_tx; // Default vat of product we defined

                     if ($product->default_vat_code)

-                        $ret .= ' (' . $product->default_vat_code . ')';

+                        $ret .= ' ('.$product->default_vat_code.')';

                 }

                 $found = 1;

             }

@@ -4819,8 +4819,8 @@ 
             if (empty(Globals::$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS)) {

 // If vat of product for the country not found or not defined, we return the first higher vat of country.

                 $sql = "SELECT t.taux as vat_rate, t.code as default_vat_code";

-                $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";

-                $sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='" . $thirdparty_seller->country_code . "'";

+                $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";

+                $sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$thirdparty_seller->country_code."'";

                 $sql .= " ORDER BY t.taux DESC, t.code ASC, t.recuperableonly ASC";

                 $sql .= $db->plimit(1);

 

@@ -4830,16 +4830,16 @@ 
                     if ($obj) {

                         $ret = $obj->vat_rate;

                         if ($obj->default_vat_code)

-                            $ret .= ' (' . $obj->default_vat_code . ')';

+                            $ret .= ' ('.$obj->default_vat_code.')';

                     }

                     $db->free($sql);

                 } else

                     dol_print_error($db);

             } else

-                $ret = Globals::$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;    // Forced value if autodetect fails

+                $ret = Globals::$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS; // Forced value if autodetect fails

         }

 

-        dol_syslog("get_product_vat_for_country: ret=" . $ret);

+        dol_syslog("get_product_vat_for_country: ret=".$ret);

         return $ret;

     }

 

@@ -4857,7 +4857,7 @@ 
        // global $db, $mysoc;

 

         if (!class_exists('Product')) {

-            require_once DOL_BASE_PATH . 'product/class/product.class.php';

+            require_once DOL_BASE_PATH.'product/class/product.class.php';

         }

 

         $ret = 0;

@@ -4882,8 +4882,8 @@ 
         if (!$found) {

 // If vat of product for the country not found or not defined, we return higher vat of country.

             $sql = "SELECT taux as vat_rate, localtax1, localtax2";

-            $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";

-            $sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='" . $thirdparty_seller->country_code . "'";

+            $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";

+            $sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$thirdparty_seller->country_code."'";

             $sql .= " ORDER BY t.taux DESC, t.recuperableonly ASC";

             $sql .= $db->plimit(1);

 

@@ -4900,7 +4900,7 @@ 
                 dol_print_error($db);

         }

 

-        dol_syslog("get_product_localtax_for_country: ret=" . $ret);

+        dol_syslog("get_product_localtax_for_country: ret=".$ret);

         return $ret;

     }

 

@@ -4924,7 +4924,7 @@ 
     {

        // global Globals::$conf;

 

-        require_once DOL_BASE_PATH . '/core/lib/company.lib.php';

+        require_once DOL_BASE_PATH.'/core/lib/company.lib.php';

 

 // Note: possible values for tva_assuj are 0/1 or franchise/reel

         $seller_use_vat = ((is_numeric($thirdparty_seller->tva_assuj) && !$thirdparty_seller->tva_assuj) || (!is_numeric($thirdparty_seller->tva_assuj) && $thirdparty_seller->tva_assuj == 'franchise')) ? 0 : 1;

@@ -4935,7 +4935,7 @@ 
         $buyer_country_code = $thirdparty_buyer->country_code;

         $buyer_in_cee = isInEEC($thirdparty_buyer);

 

-        dol_syslog("get_default_tva: seller use vat=" . $seller_use_vat . ", seller country=" . $seller_country_code . ", seller in cee=" . $seller_in_cee . ", buyer vat number=" . $thirdparty_buyer->tva_intra . " buyer country=" . $buyer_country_code . ", buyer in cee=" . $buyer_in_cee . ", idprod=" . $idprod . ", idprodfournprice=" . $idprodfournprice . ", SERVICE_ARE_ECOMMERCE_200238EC=" . (!empty(Globals::$conf->global->SERVICES_ARE_ECOMMERCE_200238EC) ? Globals::$conf->global->SERVICES_ARE_ECOMMERCE_200238EC : ''));

+        dol_syslog("get_default_tva: seller use vat=".$seller_use_vat.", seller country=".$seller_country_code.", seller in cee=".$seller_in_cee.", buyer vat number=".$thirdparty_buyer->tva_intra." buyer country=".$buyer_country_code.", buyer in cee=".$buyer_in_cee.", idprod=".$idprod.", idprodfournprice=".$idprodfournprice.", SERVICE_ARE_ECOMMERCE_200238EC=".(!empty(Globals::$conf->global->SERVICES_ARE_ECOMMERCE_200238EC) ? Globals::$conf->global->SERVICES_ARE_ECOMMERCE_200238EC : ''));

 

 // If services are eServices according to EU Council Directive 2002/38/EC (http://ec.europa.eu/taxation_customs/taxation/vat/traders/e-commerce/article_1610_en.htm)

 // we use the buyer VAT.

@@ -5001,14 +5001,14 @@ 
 

         if ($idprodfournprice > 0) {

             if (!class_exists('ProductFournisseur'))

-                require_once DOL_BASE_PATH . '/fourn/class/fournisseur.product.class.php';

+                require_once DOL_BASE_PATH.'/fourn/class/fournisseur.product.class.php';

             $prodprice = new ProductFournisseur($db);

             $prodprice->fetch_product_fournisseur_price($idprodfournprice);

             return $prodprice->fourn_tva_npr;

         }

         elseif ($idprod > 0) {

             if (!class_exists('Product'))

-                require_once DOL_BASE_PATH . 'product/class/product.class.php';

+                require_once DOL_BASE_PATH.'product/class/product.class.php';

             $prod = new Product($db);

             $prod->fetch($idprod);

             return $prod->tva_npr;

@@ -5087,7 +5087,7 @@ 
             if ($case == 2)

                 $result = '<input type="checkbox" value="1" checked disabled>';

             if ($case == 3)

-                $result = '<input type="checkbox" value="1" checked disabled> ' . $result;

+                $result = '<input type="checkbox" value="1" checked disabled> '.$result;

 

             $classname = 'ok';

         }

@@ -5098,7 +5098,7 @@ 
             if ($case == 2)

                 $result = '<input type="checkbox" value="0" disabled>';

             if ($case == 3)

-                $result = '<input type="checkbox" value="0" disabled> ' . $result;

+                $result = '<input type="checkbox" value="0" disabled> '.$result;

 

             if ($color == 2)

                 $classname = 'ok';

@@ -5106,7 +5106,7 @@ 
                 $classname = 'error';

         }

         if ($color)

-            return '<font class="' . $classname . '">' . $result . '</font>';

+            return '<font class="'.$classname.'">'.$result.'</font>';

         return $result;

     }

 

@@ -5140,13 +5140,13 @@ 
                 $num = preg_replace('/([^0-9])/i', '', $num);

             else

                 $num = preg_replace('/^.*\-/i', '', $num);

-            $num = substr("000" . $num, -$level);

+            $num = substr("000".$num, -$level);

             if ($level == 1)

                 $path = substr($num, 0, 1);

             if ($level == 2)

-                $path = substr($num, 1, 1) . '/' . substr($num, 0, 1);

+                $path = substr($num, 1, 1).'/'.substr($num, 0, 1);

             if ($level == 3)

-                $path = substr($num, 2, 1) . '/' . substr($num, 1, 1) . '/' . substr($num, 0, 1);

+                $path = substr($num, 2, 1).'/'.substr($num, 1, 1).'/'.substr($num, 0, 1);

         }

         else {

 // TODO

@@ -5177,7 +5177,7 @@ 
     {

        // global Globals::$conf;

 

-        dol_syslog("functions.lib::dol_mkdir: dir=" . $dir, LOG_INFO);

+        dol_syslog("functions.lib::dol_mkdir: dir=".$dir, LOG_INFO);

 

         $dir_osencoded = dol_osencode($dir);

         if (@is_dir($dir_osencoded))

@@ -5189,15 +5189,15 @@ 
         $ccdir = '';

         if (!empty($dataroot)) {

 // Remove data root from loop

-            $dir = str_replace($dataroot . '/', '', $dir);

-            $ccdir = $dataroot . '/';

+            $dir = str_replace($dataroot.'/', '', $dir);

+            $ccdir = $dataroot.'/';

         }

 

         $cdir = explode("/", $dir);

         $num = count($cdir);

         for ($i = 0; $i < $num; $i++) {

             if ($i > 0)

-                $ccdir .= '/' . $cdir[$i];

+                $ccdir .= '/'.$cdir[$i];

             else

                 $ccdir .= $cdir[$i];

             if (preg_match("/^.:$/", $ccdir, $regs))

@@ -5241,20 +5241,20 @@ 
             if ($ccdir) {

                 $ccdir_osencoded = dol_osencode($ccdir);

                 if (!@is_dir($ccdir_osencoded)) {

-                    dol_syslog("functions.lib::dol_mkdir: Directory '" . $ccdir . "' does not exists or is outside open_basedir PHP setting.", LOG_DEBUG);

+                    dol_syslog("functions.lib::dol_mkdir: Directory '".$ccdir."' does not exists or is outside open_basedir PHP setting.", LOG_DEBUG);

 

                     umask(0);

                     $dirmaskdec = octdec($newmask);

                     if (empty($newmask)) {

                         $dirmaskdec = empty(Globals::$conf->global->MAIN_UMASK) ? octdec('0755') : octdec(Globals::$conf->global->MAIN_UMASK);

                     }

-                    $dirmaskdec |= octdec('0111');  // Set x bit required for directories

+                    $dirmaskdec |= octdec('0111'); // Set x bit required for directories

                     if (!@mkdir($ccdir_osencoded, $dirmaskdec)) {

                         // Si le is_dir a renvoye une fausse info, alors on passe ici.

-                        dol_syslog("functions.lib::dol_mkdir: Fails to create directory '" . $ccdir . "' or directory already exists.", LOG_WARNING);

+                        dol_syslog("functions.lib::dol_mkdir: Fails to create directory '".$ccdir."' or directory already exists.", LOG_WARNING);

                         $nberr++;

                     } else {

-                        dol_syslog("functions.lib::dol_mkdir: Directory '" . $ccdir . "' created", LOG_DEBUG);

+                        dol_syslog("functions.lib::dol_mkdir: Directory '".$ccdir."' created", LOG_DEBUG);

                         $nberr = 0; // On remet a zero car si on arrive ici, cela veut dire que les echecs precedents peuvent etre ignore

                         $nbcreated++;

                     }

@@ -5302,9 +5302,9 @@ 
         } else {

             $pattern = "/<[^<>]+>/";

 // Exemple of $temp: <a href="/myurl" title="<u>A title</u>">0000-021</a>

-            $temp = preg_replace($pattern, "", $temp);    // pass 1

+            $temp = preg_replace($pattern, "", $temp); // pass 1

 // $temp after pass 1: <a href="/myurl" title="A title">0000-021

-            $temp = preg_replace($pattern, "", $temp);    // pass 2

+            $temp = preg_replace($pattern, "", $temp); // pass 2

 // $temp after pass 2: 0000-021

         }

 

@@ -5360,8 +5360,8 @@ 
     {

         $temp = $stringtoclean;

         foreach ($disallowed_tags as $tagtoremove) {

-            $temp = preg_replace('/<\/?' . $tagtoremove . '>/', '', $temp);

-            $temp = preg_replace('/<\/?' . $tagtoremove . '\s+[^>]*>/', '', $temp);

+            $temp = preg_replace('/<\/?'.$tagtoremove.'>/', '', $temp);

+            $temp = preg_replace('/<\/?'.$tagtoremove.'\s+[^>]*>/', '', $temp);

         }

         return $temp;

     }

@@ -5378,12 +5378,12 @@ 
     {

         if ($nboflines == 1) {

             if (dol_textishtml($text)) {

-                $firstline = preg_replace('/<br[^>]*>.*$/s', '', $text);  // The s pattern modifier means the . can match newline characters

+                $firstline = preg_replace('/<br[^>]*>.*$/s', '', $text); // The s pattern modifier means the . can match newline characters

                 $firstline = preg_replace('/<div[^>]*>.*$/s', '', $firstline); // The s pattern modifier means the . can match newline characters

             } else {

                 $firstline = preg_replace('/[\n\r].*/', '', $text);

             }

-            return $firstline . ((strlen($firstline) != strlen($text)) ? '...' : '');

+            return $firstline.((strlen($firstline) != strlen($text)) ? '...' : '');

         } else {

             $ishtml = 0;

             if (dol_textishtml($text)) {

@@ -5399,7 +5399,7 @@ 
                 $pattern = '/(<br[^>]*>)/Uu';

             } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support

             else

-                $pattern = '/(<br[^>]*>)/U';       // /U is to have UNGREEDY regex to limit to one html tag.

+                $pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.

             $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);

 

             $firstline = '';

@@ -5413,7 +5413,7 @@ 
                 $i++;

             }

             unset($a);

-            return $firstline . (($i < $nba) ? '...' : '');

+            return $firstline.(($i < $nba) ? '...' : '');

         }

     }

 

@@ -5484,9 +5484,9 @@ 
     static function dol_htmlentitiesbr_decode($stringtodecode, $pagecodeto = 'UTF-8')

     {

         $ret = dol_html_entity_decode($stringtodecode, ENT_COMPAT, $pagecodeto);

-        $ret = preg_replace('/' . "\r\n" . '<br(\s[\sa-zA-Z_="]*)?\/?>/i', "<br>", $ret);

-        $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>' . "\r\n" . '/i', "\r\n", $ret);

-        $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>' . "\n" . '/i', "\n", $ret);

+        $ret = preg_replace('/'."\r\n".'<br(\s[\sa-zA-Z_="]*)?\/?>/i', "<br>", $ret);

+        $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>'."\r\n".'/i', "\r\n", $ret);

+        $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>'."\n".'/i', "\n", $ret);

         $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', "\n", $ret);

         return $ret;

     }

@@ -5499,7 +5499,7 @@ 
      */

     static function dol_htmlcleanlastbr($stringtodecode)

     {

-        $ret = preg_replace('/(<br>|<br(\s[\sa-zA-Z_="]*)?\/?>|' . "\n" . '|' . "\r" . ')+$/i', "", $stringtodecode);

+        $ret = preg_replace('/(<br>|<br(\s[\sa-zA-Z_="]*)?\/?>|'."\n".'|'."\r".')+$/i', "", $stringtodecode);

         return $ret;

     }

 

@@ -5596,7 +5596,7 @@ 
             $pattern = '/(<br[^>]*>)/Uu';

         } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support

         else

-            $pattern = '/(<br[^>]*>)/U';       // /U is to have UNGREEDY regex to limit to one html tag.

+            $pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.

         $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);

 

         $nblines = (int) floor((count($a) + 1) / 2);

@@ -5627,7 +5627,7 @@ 
      */

     static function dol_microtime_float()

     {

-        dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);

+        dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);

 

         return microtime(true);

     }

@@ -5673,9 +5673,9 @@ 
             elseif (preg_match('/<h[0-9]>/i', $msg))

                 return true;

             elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg))

-                return true;    // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)

+                return true; // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)

             elseif (preg_match('/&#[0-9]{2,3};/i', $msg))

-                return true;    // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)

+                return true; // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)

 

             return false;

         }

@@ -5900,7 +5900,7 @@ 
                     if ($object->fetch_optionals() > 0) {

                         if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {

                             foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label) {

-                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = $object->array_options['options_' . $key];

+                                $substitutionarray['__EXTRAFIELD_'.strtoupper($key).'__'] = $object->array_options['options_'.$key];

                             }

                         }

                     }

@@ -5912,7 +5912,7 @@ 
                     $paymenturl = '';

                 } else {

                     // Set the online payment url link into __ONLINE_PAYMENT_URL__ key

-                    require_once DOL_BASE_PATH . '/core/lib/payments.lib.php';

+                    require_once DOL_BASE_PATH.'/core/lib/payments.lib.php';

                     $outputlangs->loadLangs(array('paypal', 'other'));

                     $typeforonlinepayment = 'free';

                     if (is_object($object) && $object->element == 'commande')

@@ -5973,7 +5973,7 @@ 
 

 //var_dump($substitutionarray['__AMOUNT_FORMATED__']);

         if (empty($exclude) || !in_array('date', $exclude)) {

-            include_once DOL_BASE_PATH . '/core/lib/date.lib.php';

+            include_once DOL_BASE_PATH.'/core/lib/date.lib.php';

 

             $tmp = dol_getdate(dol_now(), true);

             $tmp2 = dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']);

@@ -5983,13 +5983,13 @@ 
 

             $substitutionarray = array_merge($substitutionarray, array(

                 '__DAY__' => (string) $tmp['mday'],

-                '__DAY_TEXT__' => $outputlangs->trans('Day' . $tmp['wday']), // Monday

-                '__DAY_TEXT_SHORT__' => $outputlangs->trans($tmp['weekday'] . 'Min'), // Mon

-                '__DAY_TEXT_MIN__' => $outputlangs->trans('Short' . $tmp['weekday']), // M

+                '__DAY_TEXT__' => $outputlangs->trans('Day'.$tmp['wday']), // Monday

+                '__DAY_TEXT_SHORT__' => $outputlangs->trans($tmp['weekday'].'Min'), // Mon

+                '__DAY_TEXT_MIN__' => $outputlangs->trans('Short'.$tmp['weekday']), // M

                 '__MONTH__' => (string) $tmp['mon'],

-                '__MONTH_TEXT__' => $outputlangs->trans('Month' . sprintf("%02d", $tmp['mon'])),

-                '__MONTH_TEXT_SHORT__' => $outputlangs->trans('MonthShort' . sprintf("%02d", $tmp['mon'])),

-                '__MONTH_TEXT_MIN__' => $outputlangs->trans('MonthVeryShort' . sprintf("%02d", $tmp['mon'])),

+                '__MONTH_TEXT__' => $outputlangs->trans('Month'.sprintf("%02d", $tmp['mon'])),

+                '__MONTH_TEXT_SHORT__' => $outputlangs->trans('MonthShort'.sprintf("%02d", $tmp['mon'])),

+                '__MONTH_TEXT_MIN__' => $outputlangs->trans('MonthVeryShort'.sprintf("%02d", $tmp['mon'])),

                 '__YEAR__' => (string) $tmp['year'],

                 '__PREVIOUS_DAY__' => (string) $tmp2['day'],

                 '__PREVIOUS_MONTH__' => (string) $tmp3['month'],

@@ -6048,7 +6048,7 @@ 
                 if (!empty($tmp[1]))

                     $outputlangs->load($tmp[1]);

 

-                $text = preg_replace('/__\(' . preg_quote($reg[1], '/') . '\)__/', $msgishtml ? dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])) : $outputlangs->transnoentitiesnoconv($reg[1]), $text);

+                $text = preg_replace('/__\('.preg_quote($reg[1], '/').'\)__/', $msgishtml ? dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])) : $outputlangs->transnoentitiesnoconv($reg[1]), $text);

             }

         }

 

@@ -6064,13 +6064,13 @@ 
                 $newval = '*****forbidden*****';

             else

                 $newval = empty(Globals::$conf->global->$keyfound) ? '' : Globals::$conf->global->$keyfound;

-            $text = preg_replace('/__\[' . preg_quote($keyfound, '/') . '\]__/', $msgishtml ? dol_htmlentitiesbr($newval) : $newval, $text);

+            $text = preg_replace('/__\['.preg_quote($keyfound, '/').'\]__/', $msgishtml ? dol_htmlentitiesbr($newval) : $newval, $text);

         }

 

 // Make substitition for array $substitutionarray

         foreach ($substitutionarray as $key => $value) {

             if ($key == '__SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))

-                $value = '';  // Protection

+                $value = ''; // Protection

             if ($key == '__USER_SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))

                 $value = ''; // Protection

 

@@ -6096,7 +6096,7 @@ 
     {

        // global Globals::$conf, $user;

 

-        require_once DOL_BASE_PATH . '/core/lib/files.lib.php';

+        require_once DOL_BASE_PATH.'/core/lib/files.lib.php';

 

 // Add a substitution key for each extrafields, using key __EXTRA_XXX__

 // TODO Remove this. Already available into the getCommonSubstitutionArray used to build the substitution array.

@@ -6126,11 +6126,11 @@ 
                 if (preg_match('/functions_(.*)\.lib\.php/i', $substitfile['name'], $reg)) {

                     $module = $reg[1];

 

-                    dol_syslog("Library " . $substitfile['name'] . " found into " . $dir);

+                    dol_syslog("Library ".$substitfile['name']." found into ".$dir);

                     // Include the user's functions file

-                    require_once $dir . $substitfile['name'];

+                    require_once $dir.$substitfile['name'];

                     // Call the user's function, and only if it is defined

-                    $function_name = $module . "_" . $callfunc;

+                    $function_name = $module."_".$callfunc;

                     if (function_exists($function_name))

                         $function_name($substitutionarray, $outputlangs, $object, $parameters);

                 }

@@ -6172,13 +6172,13 @@ 
             $outputlangs = $langs;

 

         if ($date_start && $date_end) {

-            $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateFromTo', dol_print_date($date_start, $format, false, $outputlangs), dol_print_date($date_end, $format, false, $outputlangs)) . ($withparenthesis ? ')' : '');

+            $out .= ($withparenthesis ? ' (' : '').$outputlangs->transnoentitiesnoconv('DateFromTo', dol_print_date($date_start, $format, false, $outputlangs), dol_print_date($date_end, $format, false, $outputlangs)).($withparenthesis ? ')' : '');

         }

         if ($date_start && !$date_end) {

-            $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateFrom', dol_print_date($date_start, $format, false, $outputlangs)) . ($withparenthesis ? ')' : '');

+            $out .= ($withparenthesis ? ' (' : '').$outputlangs->transnoentitiesnoconv('DateFrom', dol_print_date($date_start, $format, false, $outputlangs)).($withparenthesis ? ')' : '');

         }

         if (!$date_start && $date_end) {

-            $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateUntil', dol_print_date($date_end, $format, false, $outputlangs)) . ($withparenthesis ? ')' : '');

+            $out .= ($withparenthesis ? ' (' : '').$outputlangs->transnoentitiesnoconv('DateUntil', dol_print_date($date_end, $format, false, $outputlangs)).($withparenthesis ? ')' : '');

         }

 

         return $out;

@@ -6258,7 +6258,7 @@ 
             dol_syslog("Try to add a message in stack with empty message", LOG_WARNING);

         } else {

             if (!in_array((string) $style, array('mesgs', 'warnings', 'errors')))

-                dol_print_error('', 'Bad parameter style=' . $style . ' for setEventMessages');

+                dol_print_error('', 'Bad parameter style='.$style.' for setEventMessages');

             if (empty($mesgs))

                 setEventMessage($mesg, $style);

             else {

@@ -6327,7 +6327,7 @@ 
 

 // If inline message with no format, we add it.

         if ((empty(Globals::$conf->use_javascript_ajax) || !empty(Globals::$conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) || $keepembedded) && !preg_match('/<div class=".*">/i', $out)) {

-            $divstart = '<div class="' . $style . ' clearboth">';

+            $divstart = '<div class="'.$style.' clearboth">';

             $divend = '</div>';

         }

 

@@ -6354,14 +6354,14 @@ 
             if (!empty(Globals::$conf->use_javascript_ajax) && empty(Globals::$conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && empty($keepembedded)) {

                 $return = '<script type="text/javascript">

 					$(document).ready(function() {

-						var block = ' . (!empty(Globals::$conf->global->MAIN_USE_JQUERY_BLOCKUI) ? "true" : "false") . '

+						var block = ' . (!empty(Globals::$conf->global->MAIN_USE_JQUERY_BLOCKUI) ? "true" : "false").'

 						if (block) {

-							$.dolEventValid("","' . dol_escape_js($out) . '");

+							$.dolEventValid("","' . dol_escape_js($out).'");

 						} else {

 							/* jnotify(message, preset of message type, keepmessage) */

-							$.jnotify("' . dol_escape_js($out) . '",

-							"' . ($style == "ok" ? 3000 : $style) . '",

-							' . ($style == "ok" ? "false" : "true") . ',

+							$.jnotify("' . dol_escape_js($out).'",

+							"' . ($style == "ok" ? 3000 : $style).'",

+							' . ($style == "ok" ? "false" : "true").',

 							{ remove: static function (){} } );

 						}

 					});

@@ -6556,11 +6556,11 @@ 
     {

        // global Globals::$conf;

 

-        $tmp = ini_get("unicode.filesystem_encoding");      // Disponible avec PHP 6.0

+        $tmp = ini_get("unicode.filesystem_encoding"); // Disponible avec PHP 6.0

         if (empty($tmp) && !empty($_SERVER["WINDIR"]))

             $tmp = 'iso-8859-1'; // By default for windows

         if (empty($tmp))

-            $tmp = 'utf-8';          // By default for other

+            $tmp = 'utf-8'; // By default for other

         if (!empty(Globals::$conf->global->MAIN_FILESYSTEM_ENCODING))

             $tmp = Globals::$conf->global->MAIN_FILESYSTEM_ENCODING;

 

@@ -6591,16 +6591,16 @@ 
 

 // Check in cache

         if (isset($cache_codes[$tablename][$key][$fieldid])) { // Can be defined to 0 or ''

-            return $cache_codes[$tablename][$key][$fieldid];   // Found in cache

+            return $cache_codes[$tablename][$key][$fieldid]; // Found in cache

         }

 

         dol_syslog('dol_getIdFromCode (value not found into cache)', LOG_DEBUG);

 

-        $sql = "SELECT " . $fieldid . " as valuetoget";

-        $sql .= " FROM " . MAIN_DB_PREFIX . $tablename;

-        $sql .= " WHERE " . $fieldkey . " = '" . $db->escape($key) . "'";

+        $sql = "SELECT ".$fieldid." as valuetoget";

+        $sql .= " FROM ".MAIN_DB_PREFIX.$tablename;

+        $sql .= " WHERE ".$fieldkey." = '".$db->escape($key)."'";

         if (!empty($entityfilter))

-            $sql .= " AND entity IN (" . getEntity($tablename) . ")";

+            $sql .= " AND entity IN (".getEntity($tablename).")";

 

         $resql = $db->query($sql);

         if ($resql) {

@@ -6631,8 +6631,8 @@ 
 //print $strRights."<br>\n";

         $rights = true;

         if ($strRights != '') {

-            $str = 'if(!(' . $strRights . ')) { $rights = false; }';

-            self::dol_eval($str);  // The dol_eval must contains all the// global $xxx used into a condition

+            $str = 'if(!('.$strRights.')) { $rights = false; }';

+            self::dol_eval($str); // The dol_eval must contains all the// global $xxx used into a condition

         }

         return $rights;

     }

@@ -6659,9 +6659,9 @@ 
 //print $s."<br>\n";

         if ($returnvalue) {

             if ($hideerrors)

-                return @eval('return ' . $s . ';');

+                return @eval('return '.$s.';');

             else

-                return eval('return ' . $s . ';');

+                return eval('return '.$s.';');

         }

         else {

             if ($hideerrors)

@@ -6715,7 +6715,7 @@ 
             $flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];

         }

 

-        return img_picto_common($codelang, 'flags/' . strtolower($flagImage) . '.png', $moreatt);

+        return img_picto_common($codelang, 'flags/'.strtolower($flagImage).'.png', $moreatt);

     }

 

     /**

@@ -6913,16 +6913,16 @@ 
             'zu-ZA',

         );

 

-        $buildprimarykeytotest = strtolower($countrycode) . '-' . strtoupper($countrycode);

+        $buildprimarykeytotest = strtolower($countrycode).'-'.strtoupper($countrycode);

         if (in_array($buildprimarykeytotest, $locales))

-            return strtolower($countrycode) . '_' . strtoupper($countrycode);

+            return strtolower($countrycode).'_'.strtoupper($countrycode);

 

         foreach ($locales as $locale) {

             $locale_language = locale_get_primary_language($locale);

             $locale_region = locale_get_region($locale);

             if (strtoupper($countrycode) == $locale_region) {

 //var_dump($locale.'-'.$locale_language.'-'.$locale_region);

-                return strtolower($locale_language) . '_' . strtoupper($locale_region);

+                return strtolower($locale_language).'_'.strtoupper($locale_region);

             }

         }

 

@@ -6983,7 +6983,7 @@ 
                                 $label = $langs->trans($values[2]);

 

                             //$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]), 1);

-                            $head[$h][0] = BASE_URI . preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]);

+                            $head[$h][0] = BASE_URI.preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]);

                             $head[$h][1] = $label;

                             $head[$h][2] = str_replace('+', '', $values[1]);

                             $h++;

@@ -7054,43 +7054,43 @@ 
         // global $micro_start_time;

 

         if ($zone == 'private')

-            print "\n" . '<!-- Common footer for private page -->' . "\n";

+            print "\n".'<!-- Common footer for private page -->'."\n";

         else

-            print "\n" . '<!-- Common footer for public page -->' . "\n";

+            print "\n".'<!-- Common footer for public page -->'."\n";

 

 // A div to store page_y POST parameter so we can read it using javascript

         print "\n<!-- A div to store page_y POST paramater -->\n";

-        print '<div id="page_y" style="display: none;">' . $_POST['page_y'] . '</div>' . "\n";

+        print '<div id="page_y" style="display: none;">'.$_POST['page_y'].'</div>'."\n";

 

         $parameters = array();

-        $reshook = $hookmanager->executeHooks('printCommonFooter', $parameters);    // Note that $action and $object may have been modified by some hooks

+        $reshook = $hookmanager->executeHooks('printCommonFooter', $parameters); // Note that $action and $object may have been modified by some hooks

         if (empty($reshook)) {

             if (!empty(Globals::$conf->global->MAIN_HTML_FOOTER))

-                print Globals::$conf->global->MAIN_HTML_FOOTER . "\n";

+                print Globals::$conf->global->MAIN_HTML_FOOTER."\n";

 

             print "\n";

             if (!empty(Globals::$conf->use_javascript_ajax)) {

-                print '<script type="text/javascript" language="javascript">' . "\n";

-                print 'jQuery(document).ready(function() {' . "\n";

+                print '<script type="text/javascript" language="javascript">'."\n";

+                print 'jQuery(document).ready(function() {'."\n";

 

                 if ($zone == 'private' && empty(Globals::$conf->dol_use_jmobile)) {

                     print "\n";

-                    print '/* JS CODE TO ENABLE to manage handler to switch left menu page (menuhider) */' . "\n";

+                    print '/* JS CODE TO ENABLE to manage handler to switch left menu page (menuhider) */'."\n";

                     print 'jQuery(".menuhider").click(function() {';

-                    print '  console.log("We click on .menuhider");' . "\n";

+                    print '  console.log("We click on .menuhider");'."\n";

                     //print "  $('.side-nav').animate({width:'toggle'},200);\n";     // OK with eldy theme but not with md

                     print "  $('.side-nav').toggle()\n";

                     print "  $('.login_block').toggle()\n";

-                    print '});' . "\n";

+                    print '});'."\n";

                 }

 

 // Management of focus and mandatory for fields

                 if ($action == 'create' || $action == 'edit' || (empty($action) && (preg_match('/new\.php/', $_SERVER["PHP_SELF"])))) {

-                    print '/* JS CODE TO ENABLE to manage focus and mandatory form fields */' . "\n";

+                    print '/* JS CODE TO ENABLE to manage focus and mandatory form fields */'."\n";

                     $relativepathstring = $_SERVER["PHP_SELF"];

                     // Clean $relativepathstring

                     if (constant('DOL_BASE_URI'))

-                        $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);

+                        $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_BASE_URI'), '/').'/', '', $relativepathstring);

                     $relativepathstring = preg_replace('/^\//', '', $relativepathstring);

                     $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);

                     $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

@@ -7113,9 +7113,9 @@ 
                             if ($qualified) {

                                 foreach ($defval as $paramkey => $paramval) {

                                     // Set focus on field

-                                    print 'jQuery("input[name=\'' . $paramkey . '\']").focus();' . "\n";

-                                    print 'jQuery("textarea[name=\'' . $paramkey . '\']").focus();' . "\n";

-                                    print 'jQuery("select[name=\'' . $paramkey . '\']").focus();' . "\n";  // Not really usefull, but we keep it in case of.

+                                    print 'jQuery("input[name=\''.$paramkey.'\']").focus();'."\n";

+                                    print 'jQuery("textarea[name=\''.$paramkey.'\']").focus();'."\n";

+                                    print 'jQuery("select[name=\''.$paramkey.'\']").focus();'."\n"; // Not really usefull, but we keep it in case of.

                                 }

                             }

                         }

@@ -7139,16 +7139,16 @@ 
                             if ($qualified) {

                                 foreach ($defval as $paramkey => $paramval) {

                                     // Add property 'required' on input

-                                    print 'jQuery("input[name=\'' . $paramkey . '\']").prop(\'required\',true);' . "\n";

-                                    print 'jQuery("textarea[name=\'' . $paramkey . '\']").prop(\'required\',true);' . "\n";

-                                    print 'jQuery("select[name=\'' . $paramkey . '\']").prop(\'required\',true);' . "\n";  // required on a select works only if key is "", this does not happen in Dolibarr

+                                    print 'jQuery("input[name=\''.$paramkey.'\']").prop(\'required\',true);'."\n";

+                                    print 'jQuery("textarea[name=\''.$paramkey.'\']").prop(\'required\',true);'."\n";

+                                    print 'jQuery("select[name=\''.$paramkey.'\']").prop(\'required\',true);'."\n"; // required on a select works only if key is "", this does not happen in Dolibarr

                                 }

                             }

                         }

                     }

                 }

 

-                print '});' . "\n";

+                print '});'."\n";

 

 // Google Analytics

 // TODO Add a hook here

@@ -7156,15 +7156,15 @@ 
                     if ((Globals::$conf->dol_use_jmobile != 4)) {

                         print "\n";

                         print "/* JS CODE TO ENABLE for google analtics tag */\n";

-                        print '  var _gaq = _gaq || [];' . "\n";

-                        print '  _gaq.push([\'_setAccount\', \'' . Globals::$conf->global->MAIN_GOOGLE_AN_ID . '\']);' . "\n";

-                        print '  _gaq.push([\'_trackPageview\']);' . "\n";

-                        print '' . "\n";

-                        print '  (function() {' . "\n";

-                        print '    var ga = document.createElement(\'script\'); ga.type = \'text/javascript\'; ga.async = true;' . "\n";

-                        print '    ga.src = (\'https:\' == document.location.protocol ? \'https://ssl\' : \'http://www\') + \'.google-analytics.com/ga.js\';' . "\n";

-                        print '    var s = document.getElementsByTagName(\'script\')[0]; s.parentNode.insertBefore(ga, s);' . "\n";

-                        print '  })();' . "\n";

+                        print '  var _gaq = _gaq || [];'."\n";

+                        print '  _gaq.push([\'_setAccount\', \''.Globals::$conf->global->MAIN_GOOGLE_AN_ID.'\']);'."\n";

+                        print '  _gaq.push([\'_trackPageview\']);'."\n";

+                        print ''."\n";

+                        print '  (function() {'."\n";

+                        print '    var ga = document.createElement(\'script\'); ga.type = \'text/javascript\'; ga.async = true;'."\n";

+                        print '    ga.src = (\'https:\' == document.location.protocol ? \'https://ssl\' : \'http://www\') + \'.google-analytics.com/ga.js\';'."\n";

+                        print '    var s = document.getElementsByTagName(\'script\')[0]; s.parentNode.insertBefore(ga, s);'."\n";

+                        print '  })();'."\n";

                     }

                 }

 

@@ -7174,27 +7174,27 @@ 
                     print "/* JS CODE TO ENABLE to add memory info */\n";

                     print 'window.console && console.log("';

                     if (!empty(Globals::$conf->global->MEMCACHED_SERVER))

-                        print 'MEMCACHED_SERVER=' . Globals::$conf->global->MEMCACHED_SERVER . ' - ';

-                    print 'MAIN_OPTIMIZE_SPEED=' . (isset(Globals::$conf->global->MAIN_OPTIMIZE_SPEED) ? Globals::$conf->global->MAIN_OPTIMIZE_SPEED : 'off');

+                        print 'MEMCACHED_SERVER='.Globals::$conf->global->MEMCACHED_SERVER.' - ';

+                    print 'MAIN_OPTIMIZE_SPEED='.(isset(Globals::$conf->global->MAIN_OPTIMIZE_SPEED) ? Globals::$conf->global->MAIN_OPTIMIZE_SPEED : 'off');

                     if (!empty($micro_start_time)) {   // Works only if MAIN_SHOW_TUNING_INFO is defined at $_SERVER level. Not in// global variable.

                         $micro_end_time = microtime(true);

-                        print ' - Build time: ' . ceil(1000 * ($micro_end_time - $micro_start_time)) . ' ms';

+                        print ' - Build time: '.ceil(1000 * ($micro_end_time - $micro_start_time)).' ms';

                     }

                     if (function_exists("memory_get_usage")) {

-                        print ' - Mem: ' . memory_get_usage();

+                        print ' - Mem: '.memory_get_usage();

                     }

                     if (function_exists("xdebug_memory_usage")) {

-                        print ' - XDebug time: ' . ceil(1000 * xdebug_time_index()) . ' ms';

-                        print ' - XDebug mem: ' . xdebug_memory_usage();

-                        print ' - XDebug mem peak: ' . xdebug_peak_memory_usage();

+                        print ' - XDebug time: '.ceil(1000 * xdebug_time_index()).' ms';

+                        print ' - XDebug mem: '.xdebug_memory_usage();

+                        print ' - XDebug mem peak: '.xdebug_peak_memory_usage();

                     }

                     if (function_exists("zend_loader_file_encoded")) {

-                        print ' - Zend encoded file: ' . (zend_loader_file_encoded() ? 'yes' : 'no');

+                        print ' - Zend encoded file: '.(zend_loader_file_encoded() ? 'yes' : 'no');

                     }

-                    print '");' . "\n";

+                    print '");'."\n";

                 }

 

-                print "\n" . '</script>' . "\n";

+                print "\n".'</script>'."\n";

             }

 

 // Add Xdebug coverage of code

@@ -7208,7 +7208,7 @@ 
                 print "<!-- Start of log output\n";

 //print '<div class="hidden">'."\n";

                 foreach (Globals::$conf->logbuffer as $logline) {

-                    print $logline . "<br>\n";

+                    print $logline."<br>\n";

                 }

 //print '</div>'."\n";

                 print "End of log output -->\n";

@@ -7251,8 +7251,8 @@ 
      */

     static function dol_set_focus($selector)

     {

-        print "\n" . '<!-- Set focus onto a specific field -->' . "\n";

-        print '<script type="text/javascript" language="javascript">jQuery(document).ready(function() { jQuery("' . dol_escape_js($selector) . '").focus(); });</script>' . "\n";

+        print "\n".'<!-- Set focus onto a specific field -->'."\n";

+        print '<script type="text/javascript" language="javascript">jQuery(document).ready(function() { jQuery("'.dol_escape_js($selector).'").focus(); });</script>'."\n";

     }

 

     /**

@@ -7297,7 +7297,7 @@ 
             $value = preg_replace('/\*/', '%', $value); // Replace * with %

         }

         if ($mode == 1) {

-            $value = preg_replace('/([<>=]+)\s+([0-9' . preg_quote($langs->trans("DecimalSeparator"), '/') . '\-])/', '\1\2', $value); // Clean string '< 10' into '<10' so we can the explode on space to get all tests to do

+            $value = preg_replace('/([<>=]+)\s+([0-9'.preg_quote($langs->trans("DecimalSeparator"), '/').'\-])/', '\1\2', $value); // Clean string '< 10' into '<10' so we can the explode on space to get all tests to do

         }

 

         $value = preg_replace('/\s*\|\s*/', '|', $value);

@@ -7326,14 +7326,14 @@ 
                     if ($newcrit != '') {

                         $numnewcrit = price2num($newcrit);

                         if (is_numeric($numnewcrit)) {

-                            $newres .= ($i2 > 0 ? ' OR ' : '') . $field . ' ' . $operator . ' ' . $numnewcrit;

+                            $newres .= ($i2 > 0 ? ' OR ' : '').$field.' '.$operator.' '.$numnewcrit;

                         } else {

-                            $newres .= ($i2 > 0 ? ' OR ' : '') . '1 = 2'; // force false

+                            $newres .= ($i2 > 0 ? ' OR ' : '').'1 = 2'; // force false

                         }

                         $i2++; // a criteria was added to string

                     }

                 } else if ($mode == 2) {

-                    $newres .= ($i2 > 0 ? ' OR ' : '') . $field . " IN (" . $db->escape(trim($crit)) . ")";

+                    $newres .= ($i2 > 0 ? ' OR ' : '').$field." IN (".$db->escape(trim($crit)).")";

                     $i2++; // a criteria was added to string

                 } else if ($mode == 3) {

                     $tmparray = explode(',', trim($crit));

@@ -7342,10 +7342,10 @@ 
                         foreach ($tmparray as $val) {

                             if ($val) {

                                 $listofcodes .= ($listofcodes ? ',' : '');

-                                $listofcodes .= "'" . $db->escape(trim($val)) . "'";

+                                $listofcodes .= "'".$db->escape(trim($val))."'";

                             }

                         }

-                        $newres .= ($i2 > 0 ? ' OR ' : '') . $field . " IN (" . $listofcodes . ")";

+                        $newres .= ($i2 > 0 ? ' OR ' : '').$field." IN (".$listofcodes.")";

                         $i2++; // a criteria was added to string

                     }

                 } else if ($mode == 4) {

@@ -7354,10 +7354,10 @@ 
                         $listofcodes = '';

                         foreach ($tmparray as $val) {

                             if ($val) {

-                                $newres .= ($i2 > 0 ? ' OR (' : '(') . $field . ' LIKE \'' . $db->escape(trim($val)) . ',%\'';

-                                $newres .= ' OR ' . $field . ' = \'' . $db->escape(trim($val)) . '\'';

-                                $newres .= ' OR ' . $field . ' LIKE \'%,' . $db->escape(trim($val)) . '\'';

-                                $newres .= ' OR ' . $field . ' LIKE \'%,' . $db->escape(trim($val)) . ',%\'';

+                                $newres .= ($i2 > 0 ? ' OR (' : '(').$field.' LIKE \''.$db->escape(trim($val)).',%\'';

+                                $newres .= ' OR '.$field.' = \''.$db->escape(trim($val)).'\'';

+                                $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).'\'';

+                                $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).',%\'';

                                 $newres .= ')';

                                 $i2++;

                             }

@@ -7374,9 +7374,9 @@ 
                         $newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');

 

                         if (preg_match('/\.(id|rowid)$/', $field)) { // Special case for rowid that is sometimes a ref so used as a search field

-                            $newres .= $field . " = " . (is_numeric(trim($tmpcrit)) ? trim($tmpcrit) : '0');

+                            $newres .= $field." = ".(is_numeric(trim($tmpcrit)) ? trim($tmpcrit) : '0');

                         } else {

-                            $newres .= $field . " LIKE '";

+                            $newres .= $field." LIKE '";

 

                             $tmpcrit = trim($tmpcrit);

                             $tmpcrit2 = $tmpcrit;

@@ -7395,7 +7395,7 @@ 
                             $newres .= $tmpafter;

                             $newres .= "'";

                             if ($tmpcrit2 == '') {

-                                $newres .= ' OR ' . $field . " IS NULL";

+                                $newres .= ' OR '.$field." IS NULL";

                             }

                         }

 

@@ -7406,10 +7406,10 @@ 
                 $i++;

             }

             if ($newres)

-                $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') . $newres . ($i2 > 1 ? ')' : '');

+                $res = $res.($res ? ' AND ' : '').($i2 > 1 ? '(' : '').$newres.($i2 > 1 ? ')' : '');

             $j++;

         }

-        $res = ($nofirstand ? "" : " AND ") . "(" . $res . ")";

+        $res = ($nofirstand ? "" : " AND ")."(".$res.")";

 //print 'xx'.$res.'yy';

         return $res;

     }

@@ -7428,8 +7428,8 @@ 
         $url = $object->getLastMainDocLink($object->element);

 

         if ($url) {

-            $out .= img_picto('', 'object_globe.png') . ' ' . $langs->trans("DirectDownloadLink") . '<br>';

-            $out .= '<input type="text" id="directdownloadlink" class="quatrevingtpercent" value="' . $url . '">';

+            $out .= img_picto('', 'object_globe.png').' '.$langs->trans("DirectDownloadLink").'<br>';

+            $out .= '<input type="text" id="directdownloadlink" class="quatrevingtpercent" value="'.$url.'">';

             $out .= ajax_autoselect("directdownloadlink", 0);

         }

         return $out;

@@ -7470,7 +7470,7 @@ 
         if ($extName)

             $subdir = 'thumbs/';

 

-        return ($dirName ? $dirName . '/' : '') . $subdir . $fileName . $extName . $extImgTarget; // New filename for thumb

+        return ($dirName ? $dirName.'/' : '').$subdir.$fileName.$extName.$extImgTarget; // New filename for thumb

     }

 

     /**

@@ -7496,14 +7496,14 @@ 
 

         if ($alldata == 1) {

             if ($num_mime !== false)

-                return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : ''), 'mime' => dol_mimetype($relativepath),);

+                return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_BASE_URI.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param ? '&'.$param : ''), 'mime' => dol_mimetype($relativepath),);

             else

                 return array();

         }

 

 // old behavior

         if ($num_mime !== false)

-            return 'javascript:document_preview(\'' . dol_escape_js(DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : '')) . '\', \'' . dol_mimetype($relativepath) . '\', \'' . dol_escape_js($langs->trans('Preview')) . '\')';

+            return 'javascript:document_preview(\''.dol_escape_js(DOL_BASE_URI.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param ? '&'.$param : '')).'\', \''.dol_mimetype($relativepath).'\', \''.dol_escape_js($langs->trans('Preview')).'\')';

         else

             return '';

     }

@@ -7520,11 +7520,11 @@ 
        // global $langs;

         $out = '<script type="text/javascript">

                jQuery(document).ready(static function () {

-				    jQuery("#' . $htmlname . '").click(function() { jQuery(this).select(); } );

+				    jQuery("#' . $htmlname.'").click(function() { jQuery(this).select(); } );

 				});

 		    </script>';

         if ($addlink)

-            $out .= ' <a href="' . $addlink . '" target="_blank">' . $langs->trans("Link") . '</a>';

+            $out .= ' <a href="'.$addlink.'" target="_blank">'.$langs->trans("Link").'</a>';

         return $out;

     }

 

@@ -7905,9 +7905,9 @@ 
 

         if (!isset($dictvalues[$tablename])) {

             $dictvalues[$tablename] = array();

-            $sql = 'SELECT * FROM ' . $tablename . ' WHERE 1';

+            $sql = 'SELECT * FROM '.$tablename.' WHERE 1';

             if ($checkentity)

-                $sql .= ' AND entity IN (0,' . getEntity($tablename) . ')';

+                $sql .= ' AND entity IN (0,'.getEntity($tablename).')';

 

             $resql = $db->query($sql);

             if ($resql) {

@@ -7945,14 +7945,14 @@ 
                 $g = $tmp[1];

                 $b = $tmp[2];

             } else {

-                $hexr = $stringcolor[0] . $stringcolor[1];

-                $hexg = $stringcolor[2] . $stringcolor[3];

-                $hexb = $stringcolor[4] . $stringcolor[5];

+                $hexr = $stringcolor[0].$stringcolor[1];

+                $hexg = $stringcolor[2].$stringcolor[3];

+                $hexb = $stringcolor[4].$stringcolor[5];

                 $r = hexdec($hexr);

                 $g = hexdec($hexg);

                 $b = hexdec($hexb);

             }

-            $bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0;    // HSL algorithm

+            $bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0; // HSL algorithm

             if ($bright > 0.6)

                 $res = 1;

         }

@@ -7987,11 +7987,11 @@ 
                 return 0; // Entry is for menus all excluded to external users

         }

         if (!$menuentry['perms'] && $type_user)

-            return 0;            // No permissions and user is external

+            return 0; // No permissions and user is external

         if (!$menuentry['perms'] && !empty(Globals::$conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))

             return 0; // No permissions and option to hide when not allowed, even for internal user, is on

         if (!$menuentry['perms'])

-            return 2;               // No permissions and user is external

+            return 2; // No permissions and user is external

         return 1;

     }

 

Braces +1453 added lines, -1047 removed lines

@@ -75,8 +75,9 @@ 
           if ($found) return $result;

           } */

 

-        if (isset($class::$member))

-            return $class::$member;

+        if (isset($class::$member)) {
+                    return $class::$member;
+        }
         dol_print_error('', 'Try to get a static member "' . $member . '" in class "' . $class . '" that does not exists or is not static.');

         return null;

     }

@@ -127,8 +128,9 @@ 
         } else {

             $out = '';

             $addzero = array('user', 'usergroup', 'c_email_templates', 'email_template', 'default_values');

-            if (in_array($element, $addzero))

-                $out .= '0,';

+            if (in_array($element, $addzero)) {
+                            $out .= '0,';
+            }
             $out .= Globals::$conf->entity;

             return $out;

         }

@@ -307,32 +309,35 @@ 
     {

        // global $mysoc, $user, Globals::$conf;

 

-        if (empty($paramname))

-            return 'BadFirstParameterForDolUtils::GETPOST';

+        if (empty($paramname)) {
+                    return 'BadFirstParameterForDolUtils::GETPOST';
+        }
         if (empty($check)) {

             dol_syslog("Deprecated use of DolUtils::GETPOST, called with 1st param = " . $paramname . " and 2nd param is '', when calling page " . $_SERVER["PHP_SELF"], LOG_WARNING);

         // Enable this line to know who call the DolUtils::GETPOST with '' $check parameter.

         //var_dump(debug_backtrace()[0]);

         }

 

-        if (empty($method))

-            $out = isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_POST[$paramname]) ? $_POST[$paramname] : '');

-        elseif ($method == 1)

-            $out = isset($_GET[$paramname]) ? $_GET[$paramname] : '';

-        elseif ($method == 2)

-            $out = isset($_POST[$paramname]) ? $_POST[$paramname] : '';

-        elseif ($method == 3)

-            $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : '');

-        elseif ($method == 4)

-            $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_COOKIE[$paramname]) ? $_COOKIE[$paramname] : ''));

-        else

-            return 'BadThirdParameterForDolUtils::GETPOST';

+        if (empty($method)) {
+                    $out = isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_POST[$paramname]) ? $_POST[$paramname] : '');
+        } elseif ($method == 1) {
+                    $out = isset($_GET[$paramname]) ? $_GET[$paramname] : '';
+        } elseif ($method == 2) {
+                    $out = isset($_POST[$paramname]) ? $_POST[$paramname] : '';
+        } elseif ($method == 3) {
+                    $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : '');
+        } elseif ($method == 4) {
+                    $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_COOKIE[$paramname]) ? $_COOKIE[$paramname] : ''));
+        } else {
+                    return 'BadThirdParameterForDolUtils::GETPOST';
+        }
 

         if (empty($method) || $method == 3 || $method == 4) {

             $relativepathstring = $_SERVER["PHP_SELF"];

             // Clean $relativepathstring

-            if (constant('DOL_BASE_URI'))

-                $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);

+            if (constant('DOL_BASE_URI')) {
+                            $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+            }
             $relativepathstring = preg_replace('/^\//', '', $relativepathstring);

             $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);

             //var_dump($relativepathstring);

@@ -381,14 +386,17 @@ 
                                         $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

                                         $foundintru = 0;

                                         foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                            if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                                $foundintru = 1;

+                                            if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                                            $foundintru = 1;
+                                            }
                                         }

-                                        if (!$foundintru)

-                                            $qualified = 1;

+                                        if (!$foundintru) {
+                                                                                    $qualified = 1;
+                                        }
                                         //var_dump($defkey.'-'.$qualified);

-                                    } else

-                                        $qualified = 1;

+                                    } else {
+                                                                            $qualified = 1;
+                                    }
 

                                     if ($qualified) {

                                         //var_dump($user->default_values[$relativepathstring][$defkey]['createform']);

@@ -415,20 +423,24 @@ 
                                             $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

                                             $foundintru = 0;

                                             foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                                if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                                    $foundintru = 1;

+                                                if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                                                    $foundintru = 1;
+                                                }
                                             }

-                                            if (!$foundintru)

-                                                $qualified = 1;

+                                            if (!$foundintru) {
+                                                                                            $qualified = 1;
+                                            }
                                             //var_dump($defkey.'-'.$qualified);

-                                        } else

-                                            $qualified = 1;

+                                        } else {
+                                                                                    $qualified = 1;
+                                        }
 

                                         if ($qualified) {

                                             $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "=");  // we accept _, -, . and ,

                                             foreach ($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val) {

-                                                if ($out)

-                                                    $out .= ', ';

+                                                if ($out) {
+                                                                                                    $out .= ', ';
+                                                }
                                                 if ($paramname == 'sortfield') {

                                                     $out .= dol_string_nospecial($key, '', $forbidden_chars_to_replace);

                                                 }

@@ -448,14 +460,17 @@ 
                                         $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

                                         $foundintru = 0;

                                         foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                            if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                                $foundintru = 1;

+                                            if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                                            $foundintru = 1;
+                                            }
                                         }

-                                        if (!$foundintru)

-                                            $qualified = 1;

+                                        if (!$foundintru) {
+                                                                                    $qualified = 1;
+                                        }
                                         //var_dump($defkey.'-'.$qualified);

-                                    } else

-                                        $qualified = 1;

+                                    } else {
+                                                                            $qualified = 1;
+                                    }
 

                                     if ($qualified) {

                                         if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all'])) {

@@ -527,8 +542,10 @@ 
                     $newout = $user->fk_user;

                 } elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID') {

                     $newout = Globals::$conf->entity;

-                } else

-                    $newout = '';     // Key not found, we replace with empty string

+                } else {
+                                    $newout = '';
+                }
+                // Key not found, we replace with empty string

 

 

 

@@ -577,18 +594,20 @@ 
                 }

                 break;

             case 'intcomma':

-                if (preg_match('/[^0-9,-]+/i', $out))

-                    $out = '';

+                if (preg_match('/[^0-9,-]+/i', $out)) {
+                                    $out = '';
+                }
                 break;

             case 'alpha':

                 if (!is_array($out)) {

                     $out = trim($out);

                     // '"' is dangerous because param in url can close the href= or src= and add javascript functions.

                     // '../' is dangerous because it allows dir transversals

-                    if (preg_match('/"/', $out))

-                        $out = '';

-                    else if (preg_match('/\.\.\//', $out))

-                        $out = '';

+                    if (preg_match('/"/', $out)) {
+                                            $out = '';
+                    } else if (preg_match('/\.\.\//', $out)) {
+                                            $out = '';
+                    }
                 }

                 break;

             case 'san_alpha':

@@ -597,27 +616,31 @@ 
             case 'aZ':

                 if (!is_array($out)) {

                     $out = trim($out);

-                    if (preg_match('/[^a-z]+/i', $out))

-                        $out = '';

+                    if (preg_match('/[^a-z]+/i', $out)) {
+                                            $out = '';
+                    }
                 }

                 break;

             case 'aZ09':

                 if (!is_array($out)) {

                     $out = trim($out);

-                    if (preg_match('/[^a-z0-9_\-\.]+/i', $out))

-                        $out = '';

+                    if (preg_match('/[^a-z0-9_\-\.]+/i', $out)) {
+                                            $out = '';
+                    }
                 }

                 break;

             case 'aZ09comma':  // great to sanitize sortfield or sortorder params that can be t.abc,t.def_gh

                 if (!is_array($out)) {

                     $out = trim($out);

-                    if (preg_match('/[^a-z0-9_\-\.,]+/i', $out))

-                        $out = '';

+                    if (preg_match('/[^a-z0-9_\-\.,]+/i', $out)) {
+                                            $out = '';
+                    }
                 }

                 break;

             case 'array':

-                if (!is_array($out) || empty($out))

-                    $out = array();

+                if (!is_array($out) || empty($out)) {
+                                    $out = array();
+                }
                 break;

             case 'nohtml':  // Recommended for most scalar parameters

                 $out = dol_string_nohtmltag($out, 0);

@@ -627,16 +650,18 @@ 
                     $out = trim($out);

                     // '"' is dangerous because param in url can close the href= or src= and add javascript functions.

                     // '../' is dangerous because it allows dir transversals

-                    if (preg_match('/"/', $out))

-                        $out = '';

-                    else if (preg_match('/\.\.\//', $out))

-                        $out = '';

+                    if (preg_match('/"/', $out)) {
+                                            $out = '';
+                    } else if (preg_match('/\.\.\//', $out)) {
+                                            $out = '';
+                    }
                     $out = dol_string_nohtmltag($out);

                 }

                 break;

             case 'custom':

-                if (empty($filter))

-                    return 'BadFourthParameterForDolUtils::GETPOST';

+                if (empty($filter)) {
+                                    return 'BadFourthParameterForDolUtils::GETPOST';
+                }
                 $out = filter_var($out, $filter, $options);

                 break;

         }

@@ -754,11 +779,11 @@ 
                 }

             }

             if ($returnemptyifnotfound) {        // Not found into alternate dir

-                if ($returnemptyifnotfound == 1 || !file_exists($res))

-                    return '';

+                if ($returnemptyifnotfound == 1 || !file_exists($res)) {
+                                    return '';
+                }
             }

-        }

-        else {    // For an url path

+        } else {    // For an url path

 // We try to get local path of file on filesystem from url

 // Note that trying to know if a file on disk exist by forging path on disk from url

 // works only for some web server and some setup. This is bugged when

@@ -853,12 +878,14 @@ 
     static function dol_size($size, $type = '')

     {

         //global Globals::$conf;

-        if (empty(Globals::$conf->dol_optimize_smallscreen))

-            return $size;

-        if ($type == 'width' && $size > 250)

-            return 250;

-        else

-            return 10;

+        if (empty(Globals::$conf->dol_optimize_smallscreen)) {
+                    return $size;
+        }
+        if ($type == 'width' && $size > 250) {
+                    return 250;
+        } else {
+                    return 10;
+        }
     }

 

     /**

@@ -958,9 +985,10 @@ 
     {

         $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°');  // more complete than dol_sanitizeFileName

         $forbidden_chars_to_remove = array();

-        if (is_array($badcharstoreplace))

-            $forbidden_chars_to_replace = $badcharstoreplace;

-//$forbidden_chars_to_remove=array("(",")");

+        if (is_array($badcharstoreplace)) {
+                    $forbidden_chars_to_replace = $badcharstoreplace;
+        }
+        //$forbidden_chars_to_remove=array("(",")");

 

         return str_replace($forbidden_chars_to_replace, $newstr, str_replace($forbidden_chars_to_remove, "", $str));

     }

@@ -996,9 +1024,9 @@ 
         if (empty($mode)) {

             $substitjs["'"] = "\\'";

             $substitjs['"'] = "\\'";

-        } else if ($mode == 1)

-            $substitjs["'"] = "\\'";

-        else if ($mode == 2) {

+        } else if ($mode == 1) {
+                    $substitjs["'"] = "\\'";
+        } else if ($mode == 2) {

             $substitjs['"'] = '\\"';

         } else if ($mode == 3) {

             $substitjs["'"] = "\\'";

@@ -1020,10 +1048,12 @@ 
     {

 // escape quotes and backslashes, newlines, etc.

         $tmp = html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8');  // TODO Use htmlspecialchars_decode instead, that make only required change for html tags

-        if (!$keepb)

-            $tmp = strtr($tmp, array("<b>" => '', '</b>' => ''));

-        if (!$keepn)

-            $tmp = strtr($tmp, array("\r" => '\\r', "\n" => '\\n'));

+        if (!$keepb) {
+                    $tmp = strtr($tmp, array("<b>" => '', '</b>' => ''));
+        }
+        if (!$keepn) {
+                    $tmp = strtr($tmp, array("\r" => '\\r', "\n" => '\\n'));
+        }
         return htmlentities($tmp, ENT_COMPAT, 'UTF-8');      // TODO Use htmlspecialchars instead, that make only required change for html tags

     }

 

@@ -1073,8 +1103,9 @@ 
     {

        // global Globals::$conf, $user;

 // If syslog module enabled

-        if (empty(Globals::$conf->syslog->enabled))

-            return;

+        if (empty(Globals::$conf->syslog->enabled)) {
+                    return;
+        }
 

         if ($ident < 0) {

             foreach (Globals::$conf->loghandlers as $loghandlerinstance) {

@@ -1088,8 +1119,9 @@ 
             if (!in_array($level, $logLevels, true)) {

                 throw new Exception('Incorrect log level');

             }

-            if ($level > Globals::$conf->global->SYSLOG_LEVEL)

-                return;

+            if ($level > Globals::$conf->global->SYSLOG_LEVEL) {
+                            return;
+            }
 

             $message = preg_replace('/password=\'[^\']*\'/', 'password=\'hidden\'', $message); // protection to avoid to have value of password in log

 // If adding log inside HTML page is required

@@ -1114,24 +1146,30 @@ 
             );

 

 // This is when server run behind a reverse proxy

-            if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']))

-                $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'] . (empty($_SERVER["REMOTE_ADDR"]) ? '' : '->' . $_SERVER['REMOTE_ADDR']);

-// This is when server run normally on a server

-            else if (!empty($_SERVER["REMOTE_ADDR"]))

-                $data['ip'] = $_SERVER['REMOTE_ADDR'];

-// This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)

-            else if (!empty($_SERVER['SERVER_ADDR']))

-                $data['ip'] = $_SERVER['SERVER_ADDR'];

-// This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).

-            else if (!empty($_SERVER['COMPUTERNAME']))

-                $data['ip'] = $_SERVER['COMPUTERNAME'] . (empty($_SERVER['USERNAME']) ? '' : '@' . $_SERVER['USERNAME']);

-// This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it).

-            else if (!empty($_SERVER['LOGNAME']))

-                $data['ip'] = '???@' . $_SERVER['LOGNAME'];

-// Loop on each log handler and send output

+            if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+                            $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'] . (empty($_SERVER["REMOTE_ADDR"]) ? '' : '->' . $_SERVER['REMOTE_ADDR']);
+            }
+            // This is when server run normally on a server

+            else if (!empty($_SERVER["REMOTE_ADDR"])) {
+                            $data['ip'] = $_SERVER['REMOTE_ADDR'];
+            }
+            // This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)

+            else if (!empty($_SERVER['SERVER_ADDR'])) {
+                            $data['ip'] = $_SERVER['SERVER_ADDR'];
+            }
+            // This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).

+            else if (!empty($_SERVER['COMPUTERNAME'])) {
+                            $data['ip'] = $_SERVER['COMPUTERNAME'] . (empty($_SERVER['USERNAME']) ? '' : '@' . $_SERVER['USERNAME']);
+            }
+            // This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it).

+            else if (!empty($_SERVER['LOGNAME'])) {
+                            $data['ip'] = '???@' . $_SERVER['LOGNAME'];
+            }
+            // Loop on each log handler and send output

             foreach (Globals::$conf->loghandlers as $loghandlerinstance) {

-                if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler)

-                    continue;

+                if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler) {
+                                    continue;
+                }
                 $loghandlerinstance->export($data, $suffixinfilename);

             }

             unset($data);

@@ -1187,13 +1225,15 @@ 
 

 // Show title

         $showtitle = 1;

-        if (!empty(Globals::$conf->dol_optimize_smallscreen))

-            $showtitle = 0;

+        if (!empty(Globals::$conf->dol_optimize_smallscreen)) {
+                    $showtitle = 0;
+        }
         if (!empty($title) && $showtitle) {

             $limittitle = 30;

             $out .= '<a class="tabTitle">';

-            if ($picto)

-                $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_') . $picto, '', $pictoisfullpath) . ' ';

+            if ($picto) {
+                            $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_') . $picto, '', $pictoisfullpath) . ' ';
+            }
             $out .= '<span class="tabTitleText">' . dol_trunc($title, $limittitle) . '</span>';

             $out .= '</a>';

         }

@@ -1202,12 +1242,14 @@ 
         $maxkey = -1;

         if (is_array($links) && !empty($links)) {

             $keys = array_keys($links);

-            if (count($keys))

-                $maxkey = max($keys);

+            if (count($keys)) {
+                            $maxkey = max($keys);
+            }
         }

 

-        if (!empty(Globals::$conf->dol_optimize_smallscreen))

-            Globals::$conf->global->MAIN_MAXTABS_IN_CARD = 2;

+        if (!empty(Globals::$conf->dol_optimize_smallscreen)) {
+                    Globals::$conf->global->MAIN_MAXTABS_IN_CARD = 2;
+        }
 

 // Show tabs

         $bactive = false;

@@ -1220,8 +1262,9 @@ 
         for ($i = 0; $i <= $maxkey; $i++) {

             if ((is_numeric($active) && $i == $active) || (!empty($links[$i][2]) && !is_numeric($active) && $active == $links[$i][2])) {

 // If active tab is already present

-                if ($i >= $limittoshow)

-                    $limittoshow--;

+                if ($i >= $limittoshow) {
+                                    $limittoshow--;
+                }
             }

         }

 

@@ -1262,12 +1305,12 @@ 
                 }

                 $outmore .= '<div class="popuptab wordwrap" style="display:inherit;">';

                 if (isset($links[$i][2]) && $links[$i][2] == 'image') {

-                    if (!empty($links[$i][0]))

-                        $outmore .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n";

-                    else

-                        $outmore .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n";

-                }

-                else if (!empty($links[$i][1])) {

+                    if (!empty($links[$i][0])) {
+                                            $outmore .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n";
+                    } else {
+                                            $outmore .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n";
+                    }
+                } else if (!empty($links[$i][1])) {

                     $outmore .= '<a' . (!empty($links[$i][2]) ? ' id="' . $links[$i][2] . '"' : '') . ' class="wordwrap inline-block' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">';

                     $outmore .= preg_replace('/([a-z])\/([a-z])/i', '\\1 / \\2', $links[$i][1]); // Replace x/y with x / y to allow wrap on long composed texts.

                     $outmore .= '</a>' . "\n";

@@ -1278,8 +1321,9 @@ 
             }

             $displaytab = $i;

         }

-        if ($popuptab)

-            $outmore .= '</div>';

+        if ($popuptab) {
+                    $outmore .= '</div>';
+        }
 

         if ($displaytab > $limittoshow) {

             $left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');

@@ -1302,8 +1346,9 @@ 
 

         $out .= "</div>\n";

 

-        if (!$notab || $notab == -1)

-            $out .= "\n" . '<div class="tabBar' . ($notab == -1 ? '' : ' tabBarWithBottom') . '">' . "\n";

+        if (!$notab || $notab == -1) {
+                    $out .= "\n" . '<div class="tabBar' . ($notab == -1 ? '' : ' tabBarWithBottom') . '">' . "\n";
+        }
 

         $parameters = array('tabname' => $active, 'out' => $out);

         $reshook = $hookmanager->executeHooks('printTabsHead', $parameters); // This hook usage is called just before output the head of tabs. Take also a look at "completeTabsHead"

@@ -1333,10 +1378,11 @@ 
      */

     static function dol_get_fiche_end($notab = 0)

     {

-        if (!$notab || $notab == -1)

-            return "\n</div>\n";

-        else

-            return '';

+        if (!$notab || $notab == -1) {
+                    return "\n</div>\n";
+        } else {
+                    return '';
+        }
     }

 

     /**

@@ -1368,40 +1414,55 @@ 
         $showimage = 1;

         $entity = (empty($object->entity) ? Globals::$conf->entity : $object->entity);

         $showbarcode = empty(Globals::$conf->barcode->enabled) ? 0 : ($object->barcode ? 1 : 0);

-        if (!empty(Globals::$conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance))

-            $showbarcode = 0;

+        if (!empty(Globals::$conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) {
+                    $showbarcode = 0;
+        }
         $modulepart = 'unknown';

 

-        if ($object->element == 'societe')

-            $modulepart = 'societe';

-        if ($object->element == 'contact')

-            $modulepart = 'contact';

-        if ($object->element == 'member')

-            $modulepart = 'memberphoto';

-        if ($object->element == 'user')

-            $modulepart = 'userphoto';

-        if ($object->element == 'product')

-            $modulepart = 'product';

+        if ($object->element == 'societe') {
+                    $modulepart = 'societe';
+        }
+        if ($object->element == 'contact') {
+                    $modulepart = 'contact';
+        }
+        if ($object->element == 'member') {
+                    $modulepart = 'memberphoto';
+        }
+        if ($object->element == 'user') {
+                    $modulepart = 'userphoto';
+        }
+        if ($object->element == 'product') {
+                    $modulepart = 'product';
+        }
 

         if (class_exists("Imagick")) {

-            if ($object->element == 'propal')

-                $modulepart = 'propal';

-            if ($object->element == 'commande')

-                $modulepart = 'commande';

-            if ($object->element == 'facture')

-                $modulepart = 'facture';

-            if ($object->element == 'fichinter')

-                $modulepart = 'ficheinter';

-            if ($object->element == 'contrat')

-                $modulepart = 'contract';

-            if ($object->element == 'supplier_proposal')

-                $modulepart = 'supplier_proposal';

-            if ($object->element == 'order_supplier')

-                $modulepart = 'supplier_order';

-            if ($object->element == 'invoice_supplier')

-                $modulepart = 'supplier_invoice';

-            if ($object->element == 'expensereport')

-                $modulepart = 'expensereport';

+            if ($object->element == 'propal') {
+                            $modulepart = 'propal';
+            }
+            if ($object->element == 'commande') {
+                            $modulepart = 'commande';
+            }
+            if ($object->element == 'facture') {
+                            $modulepart = 'facture';
+            }
+            if ($object->element == 'fichinter') {
+                            $modulepart = 'ficheinter';
+            }
+            if ($object->element == 'contrat') {
+                            $modulepart = 'contract';
+            }
+            if ($object->element == 'supplier_proposal') {
+                            $modulepart = 'supplier_proposal';
+            }
+            if ($object->element == 'order_supplier') {
+                            $modulepart = 'supplier_order';
+            }
+            if ($object->element == 'invoice_supplier') {
+                            $modulepart = 'supplier_invoice';
+            }
+            if ($object->element == 'expensereport') {
+                            $modulepart = 'expensereport';
+            }
         }

 

         if ($object->element == 'product') {

@@ -1409,11 +1470,12 @@ 
             $cssclass = 'photoref';

             $showimage = $object->is_photo_available(Globals::$conf->product->multidir_output[$entity]);

             $maxvisiblephotos = (isset(Globals::$conf->global->PRODUCT_MAX_VISIBLE_PHOTO) ? Globals::$conf->global->PRODUCT_MAX_VISIBLE_PHOTO : 5);

-            if (Globals::$conf->browser->layout == 'phone')

-                $maxvisiblephotos = 1;

-            if ($showimage)

-                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('product', Globals::$conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';

-            else {

+            if (Globals::$conf->browser->layout == 'phone') {
+                            $maxvisiblephotos = 1;
+            }
+            if ($showimage) {
+                            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('product', Globals::$conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';
+            } else {

                 if (!empty(Globals::$conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {

                     $nophoto = '';

                     $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';

@@ -1429,11 +1491,12 @@ 
             $cssclass = 'photoref';

             $showimage = $object->is_photo_available(Globals::$conf->ticket->multidir_output[$entity] . '/' . $object->track_id);

             $maxvisiblephotos = (isset(Globals::$conf->global->TICKETSUP_MAX_VISIBLE_PHOTO) ? Globals::$conf->global->TICKETSUP_MAX_VISIBLE_PHOTO : 2);

-            if (Globals::$conf->browser->layout == 'phone')

-                $maxvisiblephotos = 1;

-            if ($showimage)

-                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('ticket', Globals::$conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';

-            else {

+            if (Globals::$conf->browser->layout == 'phone') {
+                            $maxvisiblephotos = 1;
+            }
+            if ($showimage) {
+                            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('ticket', Globals::$conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';
+            } else {

                 if (!empty(Globals::$conf->global->TICKETSUP_NODISPLAYIFNOPHOTO)) {

                     $nophoto = '';

                     $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';

@@ -1458,8 +1521,10 @@ 
                         } else {

                             $subdir = get_exdir($object->id, 0, 0, 1, $object, $modulepart);

                         }

-                        if (empty($subdir))

-                            $subdir = 'errorgettingsubdirofobject'; // Protection to avoid to return empty path

+                        if (empty($subdir)) {
+                                                    $subdir = 'errorgettingsubdirofobject';
+                        }
+                        // Protection to avoid to return empty path

 

                         $filepath = $dir_output . $subdir . "/";

 

@@ -1480,14 +1545,16 @@ 
                                 if (empty(Globals::$conf->global->MAIN_DISABLE_PDF_THUMBS)) {  // If you experienc trouble with pdf thumb generation and imagick, you can disable here.

                                     include_once DOL_BASE_PATH . '/core/lib/files.lib.php';

                                     $ret = dol_convert_file($file, 'png', $fileimage);

-                                    if ($ret < 0)

-                                        $error++;

+                                    if ($ret < 0) {
+                                                                            $error++;
+                                    }
                                 }

                             }

 

                             $heightforphotref = 70;

-                            if (!empty(Globals::$conf->dol_optimize_smallscreen))

-                                $heightforphotref = 60;

+                            if (!empty(Globals::$conf->dol_optimize_smallscreen)) {
+                                                            $heightforphotref = 60;
+                            }
                             // Si fichier png PDF d'1 page trouve

                             if (file_exists($fileimage)) {

                                 $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';

@@ -1523,8 +1590,10 @@ 
                         $width = 14;

                         $cssclass = 'photorefcenter';

                         $picto = $object->picto;

-                        if ($object->element == 'project' && !$object->public)

-                            $picto = 'project'; // instead of projectpub

+                        if ($object->element == 'project' && !$object->public) {
+                                                    $picto = 'project';
+                        }
+                        // instead of projectpub

                         $nophoto = img_picto('', 'object_' . $picto, '', false, 1);

                     }

                     $morehtmlleft .= '<!-- No photo to show -->';

@@ -1535,8 +1604,9 @@ 
             }

         }

 

-        if ($showbarcode)

-            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $form->showbarcode($object) . '</div>';

+        if ($showbarcode) {
+                    $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $form->showbarcode($object) . '</div>';
+        }
 

         if ($object->element == 'societe') {

             if (!empty(Globals::$conf->use_javascript_ajax) && $user->rights->societe->creer && !empty(Globals::$conf->global->MAIN_DIRECT_STATUS_UPDATE)) {

@@ -1560,35 +1630,37 @@ 
             }

         } elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan'))) {

             $tmptxt = $object->getLibStatut(6, $object->totalpaye);

-            if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || Globals::$conf->browser->layout == 'phone')

-                $tmptxt = $object->getLibStatut(5, $object->totalpaye);

+            if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || Globals::$conf->browser->layout == 'phone') {
+                            $tmptxt = $object->getLibStatut(5, $object->totalpaye);
+            }
             $morehtmlstatus .= $tmptxt;

-        }

-        elseif ($object->element == 'contrat' || $object->element == 'contract') {

-            if ($object->statut == 0)

-                $morehtmlstatus .= $object->getLibStatut(5);

-            else

-                $morehtmlstatus .= $object->getLibStatut(4);

-        }

-        elseif ($object->element == 'facturerec') {

-            if ($object->frequency == 0)

-                $morehtmlstatus .= $object->getLibStatut(2);

-            else

-                $morehtmlstatus .= $object->getLibStatut(5);

-        }

-        elseif ($object->element == 'project_task') {

+        } elseif ($object->element == 'contrat' || $object->element == 'contract') {

+            if ($object->statut == 0) {
+                            $morehtmlstatus .= $object->getLibStatut(5);
+            } else {
+                            $morehtmlstatus .= $object->getLibStatut(4);
+            }
+        } elseif ($object->element == 'facturerec') {

+            if ($object->frequency == 0) {
+                            $morehtmlstatus .= $object->getLibStatut(2);
+            } else {
+                            $morehtmlstatus .= $object->getLibStatut(5);
+            }
+        } elseif ($object->element == 'project_task') {

             $object->fk_statut = 1;

-            if ($object->progress > 0)

-                $object->fk_statut = 2;

-            if ($object->progress >= 100)

-                $object->fk_statut = 3;

+            if ($object->progress > 0) {
+                            $object->fk_statut = 2;
+            }
+            if ($object->progress >= 100) {
+                            $object->fk_statut = 3;
+            }
             $tmptxt = $object->getLibStatut(5);

             $morehtmlstatus .= $tmptxt;  // No status on task

-        }

-        else { // Generic case

+        } else { // Generic case

             $tmptxt = $object->getLibStatut(6);

-            if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || Globals::$conf->browser->layout == 'phone')

-                $tmptxt = $object->getLibStatut(5);

+            if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || Globals::$conf->browser->layout == 'phone') {
+                            $tmptxt = $object->getLibStatut(5);
+            }
             $morehtmlstatus .= $tmptxt;

         }

 

@@ -1602,13 +1674,15 @@ 
         }

 

 // Add alias for thirdparty

-        if (!empty($object->name_alias))

-            $morehtmlref .= '<div class="refidno">' . $object->name_alias . '</div>';

+        if (!empty($object->name_alias)) {
+                    $morehtmlref .= '<div class="refidno">' . $object->name_alias . '</div>';
+        }
 

 // Add label

         if ($object->element == 'product' || $object->element == 'bank_account' || $object->element == 'project_task') {

-            if (!empty($object->label))

-                $morehtmlref .= '<div class="refidno">' . $object->label . '</div>';

+            if (!empty($object->label)) {
+                            $morehtmlref .= '<div class="refidno">' . $object->label . '</div>';
+            }
         }

 

         if (method_exists($object, 'getBannerAddress') && $object->element != 'product' && $object->element != 'bookmark' && $object->element != 'ecm_directories' && $object->element != 'ecm_files') {

@@ -1641,15 +1715,19 @@ 
     {

        // global Globals::$conf, $langs;

         $ret = '';

-        if ($fieldrequired)

-            $ret .= '<span class="fieldrequired">';

-        if ((Globals::$conf->dol_use_jmobile != 4))

-            $ret .= '<label for="' . $fieldkey . '">';

+        if ($fieldrequired) {
+                    $ret .= '<span class="fieldrequired">';
+        }
+        if ((Globals::$conf->dol_use_jmobile != 4)) {
+                    $ret .= '<label for="' . $fieldkey . '">';
+        }
         $ret .= $langs->trans($langkey);

-        if ((Globals::$conf->dol_use_jmobile != 4))

-            $ret .= '</label>';

-        if ($fieldrequired)

-            $ret .= '</span>';

+        if ((Globals::$conf->dol_use_jmobile != 4)) {
+                    $ret .= '</label>';
+        }
+        if ($fieldrequired) {
+                    $ret .= '</span>';
+        }
         return $ret;

     }

 

@@ -1664,8 +1742,9 @@ 
     {

        // global $bc;

         $ret = ' ' . $bc[$var];

-        if ($moreclass)

-            $ret = preg_replace('/class=\"/', 'class="' . $moreclass . ' ', $ret);

+        if ($moreclass) {
+                    $ret = preg_replace('/class=\"/', 'class="' . $moreclass . ' ', $ret);
+        }
         return $ret;

     }

 

@@ -1696,18 +1775,18 @@ 
             if ($object->state) {

                 $ret .= ($ret ? ", " : '') . $object->state;

             }

-            if ($object->zip)

-                $ret .= ($ret ? ", " : '') . $object->zip;

-        }

-        else if (in_array($object->country_code, array('GB', 'UK'))) { // UK: title firstname name \n address lines \n town state \n zip \n country

+            if ($object->zip) {
+                            $ret .= ($ret ? ", " : '') . $object->zip;
+            }
+        } else if (in_array($object->country_code, array('GB', 'UK'))) { // UK: title firstname name \n address lines \n town state \n zip \n country

             $ret .= ($ret ? $sep : '' ) . $object->town;

             if ($object->state) {

                 $ret .= ($ret ? ", " : '') . $object->state;

             }

-            if ($object->zip)

-                $ret .= ($ret ? $sep : '' ) . $object->zip;

-        }

-        else if (in_array($object->country_code, array('ES', 'TR'))) { // ES: title firstname name \n address lines \n zip town \n state \n country

+            if ($object->zip) {
+                            $ret .= ($ret ? $sep : '' ) . $object->zip;
+            }
+        } else if (in_array($object->country_code, array('ES', 'TR'))) { // ES: title firstname name \n address lines \n zip town \n state \n country

             $ret .= ($ret ? $sep : '' ) . $object->zip;

             $ret .= ($object->town ? (($object->zip ? ' ' : '') . $object->town) : '');

             if ($object->state) {

@@ -1724,8 +1803,9 @@ 
                 $ret .= ($ret ? ", " : '') . $object->state;

             }

         }

-        if (!is_object($outputlangs))

-            $outputlangs = $langs;

+        if (!is_object($outputlangs)) {
+                    $outputlangs = $langs;
+        }
         if ($withcountry) {

             $langs->load("dict");

             $ret .= ($object->country_code ? ($ret ? $sep : '') . $outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country" . $object->country_code)) : '');

@@ -1746,8 +1826,9 @@ 
     {

         if ((abs($ts) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range

             return ($is_gmt) ? @gmstrftime($fmt, $ts) : @strftime($fmt, $ts);

-        } else

-            return 'Error date into a not supported range';

+        } else {
+                    return 'Error date into a not supported range';
+        }
     }

 

     /**

@@ -1793,10 +1874,12 @@ 
                 }

             }

         }

-        if (!is_object($outputlangs))

-            $outputlangs = $langs;

-        if (!$format)

-            $format = 'daytextshort';

+        if (!is_object($outputlangs)) {
+                    $outputlangs = $langs;
+        }
+        if (!$format) {
+                    $format = 'daytextshort';
+        }
         $reduceformat = (!empty(Globals::$conf->dol_optimize_smallscreen) && in_array($format, array('day', 'dayhour'))) ? 1 : 0;

         $formatwithoutreduce = preg_replace('/reduceformat/', '', $format);

         if ($formatwithoutreduce != $format) {

@@ -1805,40 +1888,46 @@ 
         }  // so format 'dayreduceformat' is processed like day

 // Change predefined format into computer format. If found translation in lang file we use it, otherwise we use default.

 // TODO Add format daysmallyear and dayhoursmallyear

-        if ($format == 'day')

-            $format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : Globals::$conf->format_date_short);

-        else if ($format == 'hour')

-            $format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : Globals::$conf->format_hour_short);

-        else if ($format == 'hourduration')

-            $format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : Globals::$conf->format_hour_short_duration);

-        else if ($format == 'daytext')

-            $format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : Globals::$conf->format_date_text);

-        else if ($format == 'daytextshort')

-// Notice: Undefined property: stdClass::$format_date_text_short in \alixar\dolibarr\htdocs\core\lib\functions.lib.php on line 1781

-            $format = ($outputlangs->trans("FormatDateTextShort") != "FormatDateTextShort" ? $outputlangs->trans("FormatDateTextShort") : Globals::$conf->format_date_text_short);

-        else if ($format == 'dayhour')

-            $format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : Globals::$conf->format_date_hour_short);

-        else if ($format == 'dayhoursec')

-            $format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : Globals::$conf->format_date_hour_sec_short);

-        else if ($format == 'dayhourtext')

-            $format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : Globals::$conf->format_date_hour_text);

-        else if ($format == 'dayhourtextshort')

-            $format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : Globals::$conf->format_date_hour_text_short);

-// Format not sensitive to language

-        else if ($format == 'dayhourlog')

-            $format = '%Y%m%d%H%M%S';

-        else if ($format == 'dayhourldap')

-            $format = '%Y%m%d%H%M%SZ';

-        else if ($format == 'dayhourxcard')

-            $format = '%Y%m%dT%H%M%SZ';

-        else if ($format == 'dayxcard')

-            $format = '%Y%m%d';

-        else if ($format == 'dayrfc')

-            $format = '%Y-%m-%d';             // DATE_RFC3339

-        else if ($format == 'dayhourrfc')

-            $format = '%Y-%m-%dT%H:%M:%SZ';   // DATETIME RFC3339

-        else if ($format == 'standard')

-            $format = '%Y-%m-%d %H:%M:%S';

+        if ($format == 'day') {
+                    $format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : Globals::$conf->format_date_short);
+        } else if ($format == 'hour') {
+                    $format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : Globals::$conf->format_hour_short);
+        } else if ($format == 'hourduration') {
+                    $format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : Globals::$conf->format_hour_short_duration);
+        } else if ($format == 'daytext') {
+                    $format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : Globals::$conf->format_date_text);
+        } else if ($format == 'daytextshort') {
+            // Notice: Undefined property: stdClass::$format_date_text_short in \alixar\dolibarr\htdocs\core\lib\functions.lib.php on line 1781

+            $format = ($outputlangs->trans("FormatDateTextShort") != "FormatDateTextShort" ? $outputlangs->trans("FormatDateTextShort") : Globals::$conf->format_date_text_short);
+        } else if ($format == 'dayhour') {
+                    $format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : Globals::$conf->format_date_hour_short);
+        } else if ($format == 'dayhoursec') {
+                    $format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : Globals::$conf->format_date_hour_sec_short);
+        } else if ($format == 'dayhourtext') {
+                    $format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : Globals::$conf->format_date_hour_text);
+        } else if ($format == 'dayhourtextshort') {
+                    $format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : Globals::$conf->format_date_hour_text_short);
+        }
+        // Format not sensitive to language

+        else if ($format == 'dayhourlog') {
+                    $format = '%Y%m%d%H%M%S';
+        } else if ($format == 'dayhourldap') {
+                    $format = '%Y%m%d%H%M%SZ';
+        } else if ($format == 'dayhourxcard') {
+                    $format = '%Y%m%dT%H%M%SZ';
+        } else if ($format == 'dayxcard') {
+                    $format = '%Y%m%d';
+        } else if ($format == 'dayrfc') {
+                    $format = '%Y-%m-%d';
+        }
+        // DATE_RFC3339

+        else if ($format == 'dayhourrfc') {
+                    $format = '%Y-%m-%dT%H:%M:%SZ';
+        }
+        // DATETIME RFC3339

+        else if ($format == 'standard') {
+                    $format = '%Y-%m-%d %H:%M:%S';
+        }
 

         if ($reduceformat) {

             $format = str_replace('%Y', '%y', $format);

@@ -1846,8 +1935,10 @@ 
         }

 

 // If date undefined or "", we return ""

-        if (dol_strlen($time) == 0)

-            return '';  // $time=0 allowed (it means 01/01/1970 00:00:00)

+        if (dol_strlen($time) == 0) {
+                    return '';
+        }
+        // $time=0 allowed (it means 01/01/1970 00:00:00)

 

 

 

@@ -1915,8 +2006,9 @@ 
                 $timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with static function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.

 

                 $ret = adodb_strftime($format, $timetouse, $to_gmt);

-            } else

-                $ret = 'Bad value ' . $time . ' for date';

+            } else {
+                            $ret = 'Bad value ' . $time . ' for date';
+            }
         }

 

         if (preg_match('/__b__/i', $format)) {

@@ -1987,10 +2079,14 @@ 
        // global Globals::$conf;

 

         $usealternatemethod = false;

-        if ($timestamp <= 0)

-            $usealternatemethod = true;    // <= 1970

-        if ($timestamp >= 2145913200)

-            $usealternatemethod = true;  // >= 2038

+        if ($timestamp <= 0) {
+                    $usealternatemethod = true;
+        }
+        // <= 1970

+        if ($timestamp >= 2145913200) {
+                    $usealternatemethod = true;
+        }
+        // >= 2038

 

         if ($usealternatemethod) {

             $arrayinfo = adodb_getdate($timestamp, $fast);

@@ -2025,27 +2121,36 @@ 
        // global Globals::$conf;

 //print "- ".$hour.",".$minute.",".$second.",".$month.",".$day.",".$year.",".$_SERVER["WINDIR"]." -";

 // Clean parameters

-        if ($hour == -1 || empty($hour))

-            $hour = 0;

-        if ($minute == -1 || empty($minute))

-            $minute = 0;

-        if ($second == -1 || empty($second))

-            $second = 0;

+        if ($hour == -1 || empty($hour)) {
+                    $hour = 0;
+        }
+        if ($minute == -1 || empty($minute)) {
+                    $minute = 0;
+        }
+        if ($second == -1 || empty($second)) {
+                    $second = 0;
+        }
 

 // Check parameters

         if ($check) {

-            if (!$month || !$day)

-                return '';

-            if ($day > 31)

-                return '';

-            if ($month > 12)

-                return '';

-            if ($hour < 0 || $hour > 24)

-                return '';

-            if ($minute < 0 || $minute > 60)

-                return '';

-            if ($second < 0 || $second > 60)

-                return '';

+            if (!$month || !$day) {
+                            return '';
+            }
+            if ($day > 31) {
+                            return '';
+            }
+            if ($month > 12) {
+                            return '';
+            }
+            if ($hour < 0 || $hour > 24) {
+                            return '';
+            }
+            if ($minute < 0 || $minute > 60) {
+                            return '';
+            }
+            if ($second < 0 || $second > 60) {
+                            return '';
+            }
         }

 

         if (method_exists('DateTime', 'getTimestamp')) {

@@ -2102,8 +2207,10 @@ 
 

 // Note that gmmktime and mktime return same value (GMT) when used without parameters

 //if ($mode == 'gmt') $ret=gmmktime(); // Strict Standards: gmmktime(): You should be using the time() static function instead

-        if ($mode == 'gmt')

-            $ret = time(); // Time for now at greenwich.

+        if ($mode == 'gmt') {
+                    $ret = time();
+        }
+        // Time for now at greenwich.

         else if ($mode == 'tzserver') {  // Time for now with PHP server timezone added

             require_once DOL_BASE_PATH . '/core/lib/date.lib.php';

             $tzsecond = getServerTimeZoneInt('now');    // Contains tz+dayling saving time

@@ -2137,8 +2244,9 @@ 
        // global Globals::$conf, $langs;

         $level = 1024;

 

-        if (!empty(Globals::$conf->dol_optimize_smallscreen))

-            $shortunit = 1;

+        if (!empty(Globals::$conf->dol_optimize_smallscreen)) {
+                    $shortunit = 1;
+        }
 

 // Set value text

         if (empty($shortvalue) || $size < ($level * 10)) {

@@ -2173,19 +2281,23 @@ 
     {

        // global $langs;

 

-        if (empty($url))

-            return '';

+        if (empty($url)) {
+                    return '';
+        }
 

         $link = '<a href="';

-        if (!preg_match('/^http/i', $url))

-            $link .= 'http://';

+        if (!preg_match('/^http/i', $url)) {
+                    $link .= 'http://';
+        }
         $link .= $url;

         $link .= '"';

-        if ($target)

-            $link .= ' target="' . $target . '"';

+        if ($target) {
+                    $link .= ' target="' . $target . '"';
+        }
         $link .= '>';

-        if (!preg_match('/^http/i', $url))

-            $link .= 'http://';

+        if (!preg_match('/^http/i', $url)) {
+                    $link .= 'http://';
+        }
         $link .= dol_trunc($url, $max);

         $link .= '</a>';

         return '<div class="nospan float" style="margin-right: 10px">' . ($withpicto ? img_picto($langs->trans("Url"), 'object_globe.png') . ' ' : '') . $link . '</div>';

@@ -2209,13 +2321,15 @@ 
 

         $newemail = $email;

 

-        if (empty($email))

-            return '&nbsp;';

+        if (empty($email)) {
+                    return '&nbsp;';
+        }
 

         if (!empty($addlink)) {

             $newemail = '<a style="text-overflow: ellipsis;" href="';

-            if (!preg_match('/^mailto:/i', $email))

-                $newemail .= 'mailto:';

+            if (!preg_match('/^mailto:/i', $email)) {
+                            $newemail .= 'mailto:';
+            }
             $newemail .= $email;

             $newemail .= '">';

             $newemail .= dol_trunc($email, $max);

@@ -2228,13 +2342,14 @@ 
             if (($cid || $socid) && !empty(Globals::$conf->agenda->enabled) && $user->rights->agenda->myactions->create) {

                 $type = 'AC_EMAIL';

                 $link = '';

-                if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFOREMAIL))

-                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';

-                if ($link)

-                    $newemail = '<div>' . $newemail . ' ' . $link . '</div>';

+                if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFOREMAIL)) {
+                                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';
+                }
+                if ($link) {
+                                    $newemail = '<div>' . $newemail . ' ' . $link . '</div>';
+                }
             }

-        }

-        else {

+        } else {

             if ($showinvalid && !isValidEmail($email)) {

                 $langs->load("errors");

                 $newemail .= img_warning($langs->trans("ErrorBadEMail", $email));

@@ -2266,8 +2381,9 @@ 
 

         $newskype = $value;

 

-        if (empty($value))

-            return '&nbsp;';

+        if (empty($value)) {
+                    return '&nbsp;';
+        }
 

         if (!empty($type)) {

             $newskype = '<div class="divsocialnetwork inline-block valignmiddle">';

@@ -2288,13 +2404,13 @@ 
             if (($cid || $socid) && !empty(Globals::$conf->agenda->enabled) && $user->rights->agenda->myactions->create && $type == 'skype') {

                 $addlink = 'AC_SKYPE';

                 $link = '';

-                if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORSKYPE))

-                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $addlink . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';

+                if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORSKYPE)) {
+                                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $addlink . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';
+                }
                 $newskype .= ($link ? ' ' . $link : '');

             }

             $newskype .= '</div>';

-        }

-        else {

+        } else {

             $langs->load("errors");

             $newskype .= img_warning($langs->trans("ErrorBadSocialNetworkValue", $value));

         }

@@ -2323,12 +2439,14 @@ 
         if (empty($phone)) {

             return '';

         }

-        if (empty($countrycode))

-            $countrycode = $mysoc->country_code;

+        if (empty($countrycode)) {
+                    $countrycode = $mysoc->country_code;
+        }
 

 // Short format for small screens

-        if (Globals::$conf->dol_optimize_smallscreen)

-            $separ = '';

+        if (Globals::$conf->dol_optimize_smallscreen) {
+                    $separ = '';
+        }
 

         $newphone = $phone;

         if (strtoupper($countrycode) == "FR") {

@@ -2494,15 +2612,18 @@ 
                 $newphone = '<a href="tel:' . $phone . '"';

                 $newphone .= '>' . $phone . '</a>';

             } else if (!empty(Globals::$conf->clicktodial->enabled) && $addlink == 'AC_TEL') {  // If click to dial, we use click to dial url

-                if (empty($user->clicktodial_loaded))

-                    $user->fetch_clicktodial();

+                if (empty($user->clicktodial_loaded)) {
+                                    $user->fetch_clicktodial();
+                }
 

 // Define urlmask

                 $urlmask = 'ErrorClickToDialModuleNotConfigured';

-                if (!empty(Globals::$conf->global->CLICKTODIAL_URL))

-                    $urlmask = Globals::$conf->global->CLICKTODIAL_URL;

-                if (!empty($user->clicktodial_url))

-                    $urlmask = $user->clicktodial_url;

+                if (!empty(Globals::$conf->global->CLICKTODIAL_URL)) {
+                                    $urlmask = Globals::$conf->global->CLICKTODIAL_URL;
+                }
+                if (!empty($user->clicktodial_url)) {
+                                    $urlmask = $user->clicktodial_url;
+                }
 

                 $clicktodial_poste = (!empty($user->clicktodial_poste) ? urlencode($user->clicktodial_poste) : '');

                 $clicktodial_login = (!empty($user->clicktodial_login) ? urlencode($user->clicktodial_login) : '');

@@ -2517,8 +2638,9 @@ 
                 $url = make_substitutions($url, $substitarray);

                 $newphonesav = $newphone;

                 $newphone = '<a href="' . $url . '"';

-                if (!empty(Globals::$conf->global->CLICKTODIAL_FORCENEWTARGET))

-                    $newphone .= ' target="_blank"';

+                if (!empty(Globals::$conf->global->CLICKTODIAL_FORCENEWTARGET)) {
+                                    $newphone .= ' target="_blank"';
+                }
                 $newphone .= '>' . $newphonesav . '</a>';

             }

 

@@ -2526,12 +2648,15 @@ 
             if (!empty(Globals::$conf->agenda->enabled) && $user->rights->agenda->myactions->create) {

                 $type = 'AC_TEL';

                 $link = '';

-                if ($addlink == 'AC_FAX')

-                    $type = 'AC_FAX';

-                if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORPHONE))

-                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . ($cid ? '&amp;contactid=' . $cid : '') . ($socid ? '&amp;socid=' . $socid : '') . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';

-                if ($link)

-                    $newphone = '<div>' . $newphone . ' ' . $link . '</div>';

+                if ($addlink == 'AC_FAX') {
+                                    $type = 'AC_FAX';
+                }
+                if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORPHONE)) {
+                                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . ($cid ? '&amp;contactid=' . $cid : '') . ($socid ? '&amp;socid=' . $socid : '') . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';
+                }
+                if ($link) {
+                                    $newphone = '<div>' . $newphone . ' ' . $link . '</div>';
+                }
             }

         }

 

@@ -2558,15 +2683,17 @@ 
                     $picto = '';

                 }

             }

-            if ($adddivfloat)

-                $rep .= '<div class="nospan float" style="margin-right: 10px">';

-            else

-                $rep .= '<span style="margin-right: 10px;">';

+            if ($adddivfloat) {
+                            $rep .= '<div class="nospan float" style="margin-right: 10px">';
+            } else {
+                            $rep .= '<span style="margin-right: 10px;">';
+            }
             $rep .= ($withpicto ? img_picto($titlealt, 'object_' . $picto . '.png') . ' ' : '') . $newphone;

-            if ($adddivfloat)

-                $rep .= '</div>';

-            else

-                $rep .= '</span>';

+            if ($adddivfloat) {
+                            $rep .= '</div>';
+            } else {
+                            $rep .= '</span>';
+            }
         }

 

         return $rep;

@@ -2596,8 +2723,9 @@ 
             if ($countrycode) { // If success, countrycode is us, fr, ...

                 if (file_exists(DOL_BASE_PATH . '/theme/common/flags/' . $countrycode . '.png')) {

                     $ret .= ' ' . img_picto($countrycode . ' ' . $langs->trans("AccordingToGeoIPDatabase"), DOL_BASE_URI . '/theme/common/flags/' . $countrycode . '.png', '', 1);

-                } else

-                    $ret .= ' (' . $countrycode . ')';

+                } else {
+                                    $ret .= ' (' . $countrycode . ')';
+                }
             }

         }

 

@@ -2694,26 +2822,33 @@ 
                 $out .= $hookmanager->resPrint;

             }

             if (empty($reshook)) {

-                if (empty($charfornl))

-                    $out .= nl2br($address);

-                else

-                    $out .= preg_replace('/[\r\n]+/', $charfornl, $address);

+                if (empty($charfornl)) {
+                                    $out .= nl2br($address);
+                } else {
+                                    $out .= preg_replace('/[\r\n]+/', $charfornl, $address);
+                }
 

                 $showgmap = $showomap = 0;

 

 // TODO Add a hook here

-                if (($mode == 'thirdparty' || $mode == 'societe') && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS))

-                    $showgmap = 1;

-                if ($mode == 'contact' && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS))

-                    $showgmap = 1;

-                if ($mode == 'member' && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS))

-                    $showgmap = 1;

-                if (($mode == 'thirdparty' || $mode == 'societe') && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS))

-                    $showomap = 1;

-                if ($mode == 'contact' && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS))

-                    $showomap = 1;

-                if ($mode == 'member' && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS))

-                    $showomap = 1;

+                if (($mode == 'thirdparty' || $mode == 'societe') && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS)) {
+                                    $showgmap = 1;
+                }
+                if ($mode == 'contact' && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS)) {
+                                    $showgmap = 1;
+                }
+                if ($mode == 'member' && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS)) {
+                                    $showgmap = 1;
+                }
+                if (($mode == 'thirdparty' || $mode == 'societe') && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS)) {
+                                    $showomap = 1;
+                }
+                if ($mode == 'contact' && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS)) {
+                                    $showomap = 1;
+                }
+                if ($mode == 'member' && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS)) {
+                                    $showomap = 1;
+                }
 

                 if ($showgmap) {

                     $url = dol_buildpath('/google/gmaps.php?mode=' . $mode . '&id=' . $id, 1);

@@ -2725,10 +2860,11 @@ 
                 }

             }

         }

-        if ($noprint)

-            return $out;

-        else

-            print $out;

+        if ($noprint) {
+                    return $out;
+        } else {
+                    print $out;
+        }
     }

 

     /**

@@ -2740,10 +2876,12 @@ 
      */

     static function isValidEmail($address, $acceptsupervisorkey = 0)

     {

-        if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__')

-            return true;

-        if (filter_var($address, FILTER_VALIDATE_EMAIL))

-            return true;

+        if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__') {
+                    return true;
+        }
+        if (filter_var($address, FILTER_VALIDATE_EMAIL)) {
+                    return true;
+        }
 

         return false;

     }

@@ -2765,10 +2903,12 @@ 
                 $mxhosts = array();

                 $weight = array();

                 getmxrr(idn_to_ascii($domain), $mxhosts, $weight);

-                if (count($mxhosts) > 1)

-                    return 1;

-                if (count($mxhosts) == 1 && !empty($mxhosts[0]))

-                    return 1;

+                if (count($mxhosts) > 1) {
+                                    return 1;
+                }
+                if (count($mxhosts) == 1 && !empty($mxhosts[0])) {
+                                    return 1;
+                }
 

                 return 0;

             }

@@ -2797,10 +2937,11 @@ 
      */

     static function dol_strlen($string, $stringencoding = 'UTF-8')

     {

-        if (function_exists('mb_strlen'))

-            return mb_strlen($string, $stringencoding);

-        else

-            return strlen($string);

+        if (function_exists('mb_strlen')) {
+                    return mb_strlen($string, $stringencoding);
+        } else {
+                    return strlen($string);
+        }
     }

 

     /**

@@ -2817,8 +2958,9 @@ 
     {

        // global $langs;

 

-        if (empty($stringencoding))

-            $stringencoding = $langs->charset_output;

+        if (empty($stringencoding)) {
+                    $stringencoding = $langs->charset_output;
+        }
 

         $ret = '';

         if (empty($trunconbytes)) {

@@ -2854,48 +2996,55 @@ 
     {

        // global Globals::$conf;

 

-        if ($size == 0 || !empty(Globals::$conf->global->MAIN_DISABLE_TRUNC))

-            return $string;

+        if ($size == 0 || !empty(Globals::$conf->global->MAIN_DISABLE_TRUNC)) {
+                    return $string;
+        }
 

-        if (empty($stringencoding))

-            $stringencoding = 'UTF-8';

-// reduce for small screen

-        if (Globals::$conf->dol_optimize_smallscreen == 1 && $display == 1)

-            $size = round($size / 3);

+        if (empty($stringencoding)) {
+                    $stringencoding = 'UTF-8';
+        }
+        // reduce for small screen

+        if (Globals::$conf->dol_optimize_smallscreen == 1 && $display == 1) {
+                    $size = round($size / 3);
+        }
 

 // We go always here

         if ($trunc == 'right') {

             $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

-            if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

-                return dol_substr($newstring, 0, $size, $stringencoding) . ($nodot ? '' : '...');

-            else

-//return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;

-                return $string;

-        }

-        elseif ($trunc == 'middle') {

+            if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3))) {
+                // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

+                return dol_substr($newstring, 0, $size, $stringencoding) . ($nodot ? '' : '...');
+            } else {
+                //return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;

+                return $string;
+            }
+        } elseif ($trunc == 'middle') {

             $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

             if (dol_strlen($newstring, $stringencoding) > 2 && dol_strlen($newstring, $stringencoding) > ($size + 1)) {

                 $size1 = round($size / 2);

                 $size2 = round($size / 2);

                 return dol_substr($newstring, 0, $size1, $stringencoding) . '...' . dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size2, $size2, $stringencoding);

-            } else

-                return $string;

-        }

-        elseif ($trunc == 'left') {

+            } else {
+                            return $string;
+            }
+        } elseif ($trunc == 'left') {

             $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

-            if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

-                return '...' . dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);

-            else

-                return $string;

-        }

-        elseif ($trunc == 'wrap') {

+            if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3))) {
+                // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

+                return '...' . dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);
+            } else {
+                            return $string;
+            }
+        } elseif ($trunc == 'wrap') {

             $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

-            if (dol_strlen($newstring, $stringencoding) > ($size + 1))

-                return dol_substr($newstring, 0, $size, $stringencoding) . "\n" . dol_trunc(dol_substr($newstring, $size, dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);

-            else

-                return $string;

-        } else

-            return 'BadParam3CallingDolTrunc';

+            if (dol_strlen($newstring, $stringencoding) > ($size + 1)) {
+                            return dol_substr($newstring, 0, $size, $stringencoding) . "\n" . dol_trunc(dol_substr($newstring, $size, dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);
+            } else {
+                            return $string;
+            }
+        } else {
+                    return 'BadParam3CallingDolTrunc';
+        }
     }

 

     /**

@@ -3105,8 +3254,9 @@ 
     {

        // global Globals::$conf;

 

-        if (!preg_match('/(\.png|\.gif)$/i', $picto))

-            $picto .= '.png';

+        if (!preg_match('/(\.png|\.gif)$/i', $picto)) {
+                    $picto .= '.png';
+        }
 

 //$path = DOL_BASE_URI . '/theme/' . Globals::$conf->theme . '/img/weather/' . $picto;

         $path = DOL_BASE_URI . '/theme/' . Globals::$conf->theme . '/img/weather/' . $picto;

@@ -3128,20 +3278,22 @@ 
     {

        // global Globals::$conf;

 

-        if (!preg_match('/(\.png|\.gif)$/i', $picto))

-            $picto .= '.png';

+        if (!preg_match('/(\.png|\.gif)$/i', $picto)) {
+                    $picto .= '.png';
+        }
 

-        if ($pictoisfullpath)

-            $path = $picto;

-        else {

+        if ($pictoisfullpath) {
+                    $path = $picto;
+        } else {

 //$path = DOL_BASE_URI . '/theme/common/' . $picto;

             $path = DOL_BASE_URI . '/theme/common/' . $picto;

 

             if (!empty(Globals::$conf->global->MAIN_MODULE_CAN_OVERWRITE_COMMONICONS)) {

                 $themepath = DOL_BASE_PATH . 'theme/' . Globals::$conf->theme . '/img/' . $picto;

 

-                if (file_exists($themepath))

-                    $path = $themepath;

+                if (file_exists($themepath)) {
+                                    $path = $themepath;
+                }
             }

         }

 

@@ -3180,8 +3332,9 @@ 
                 $numaction = 0;

             }

         }

-        if (!is_numeric($numaction))

-            $numaction = 0;

+        if (!is_numeric($numaction)) {
+                    $numaction = 0;
+        }
 

         return img_picto($titlealt, 'stcomm' . $numaction . '.png');

     }

@@ -3197,8 +3350,9 @@ 
     {

        // global Globals::$conf, $langs;

 

-        if ($titlealt == 'default')

-            $titlealt = $langs->trans('Show');

+        if ($titlealt == 'default') {
+                    $titlealt = $langs->trans('Show');
+        }
 

         return img_picto($titlealt, 'pdf' . $size . '.png');

     }

@@ -3214,8 +3368,9 @@ 
     {

        // global Globals::$conf, $langs;

 

-        if ($titlealt == 'default')

-            $titlealt = $langs->trans('Add');

+        if ($titlealt == 'default') {
+                    $titlealt = $langs->trans('Add');
+        }
 

         return img_picto($titlealt, 'edit_add.png', $other);

     }

@@ -3231,8 +3386,9 @@ 
     {

        // global Globals::$conf, $langs;

 

-        if ($titlealt == 'default')

-            $titlealt = $langs->trans('Remove');

+        if ($titlealt == 'default') {
+                    $titlealt = $langs->trans('Remove');
+        }
 

         return img_picto($titlealt, 'edit_remove.png', $other);

     }

@@ -3249,8 +3405,9 @@ 
     {

        // global Globals::$conf, $langs;

 

-        if ($titlealt == 'default')

-            $titlealt = $langs->trans('Modify');

+        if ($titlealt == 'default') {
+                    $titlealt = $langs->trans('Modify');
+        }
 

         return img_picto($titlealt, 'edit.png', ($float ? 'style="float: ' . ($langs->tab_translate["DIRECTION"] == 'rtl' ? 'left' : 'right') . '"' : "") . ($other ? ' ' . $other : ''));

     }

@@ -3267,8 +3424,9 @@ 
     {

        // global Globals::$conf, $langs;

 

-        if ($titlealt == 'default')

-            $titlealt = $langs->trans('View');

+        if ($titlealt == 'default') {
+                    $titlealt = $langs->trans('View');
+        }
 

         $moreatt = ($float ? 'style="float: right" ' : '') . $other;

 

@@ -3286,8 +3444,9 @@ 
     {

        // global Globals::$conf, $langs;

 

-        if ($titlealt == 'default')

-            $titlealt = $langs->trans('Delete');

+        if ($titlealt == 'default') {
+                    $titlealt = $langs->trans('Delete');
+        }
 

         return img_picto($titlealt, 'delete.png', $other);

 //return '<span class="fa fa-trash fa-2x fa-fw" style="font-size: 1.7em;" title="'.$titlealt.'"></span>';

@@ -3303,8 +3462,9 @@ 
     static function img_printer($titlealt = "default", $other = '')

     {

        // global Globals::$conf, $langs;

-        if ($titlealt == "default")

-            $titlealt = $langs->trans("Print");

+        if ($titlealt == "default") {
+                    $titlealt = $langs->trans("Print");
+        }
         return img_picto($titlealt, 'printer.png', $other);

     }

 

@@ -3319,8 +3479,9 @@ 
     {

        // global Globals::$conf, $langs;

 

-        if ($titlealt == 'default')

-            $titlealt = $langs->trans('Split');

+        if ($titlealt == 'default') {
+                    $titlealt = $langs->trans('Split');
+        }
 

         return img_picto($titlealt, 'split.png', $other);

     }

@@ -3337,10 +3498,11 @@ 
        // global Globals::$conf, $langs;

 

         if ($usealttitle) {

-            if (is_string($usealttitle))

-                $usealttitle = dol_escape_htmltag($usealttitle);

-            else

-                $usealttitle = $langs->trans('Info');

+            if (is_string($usealttitle)) {
+                            $usealttitle = dol_escape_htmltag($usealttitle);
+            } else {
+                            $usealttitle = $langs->trans('Info');
+            }
         }

 

         return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;' . ($usehelpcursor == 1 ? ' cursor: help' : ($usehelpcursor == 2 ? ' cursor: pointer' : '')) . '"');

@@ -3356,8 +3518,9 @@ 
     {

        // global Globals::$conf, $langs;

 

-        if ($titlealt == 'default')

-            $titlealt = $langs->trans('Informations');

+        if ($titlealt == 'default') {
+                    $titlealt = $langs->trans('Informations');
+        }
 

         return img_picto($titlealt, 'info.png', 'style="vertical-align: middle;"');

     }

@@ -3373,8 +3536,9 @@ 
     {

        // global Globals::$conf, $langs;

 

-        if ($titlealt == 'default')

-            $titlealt = $langs->trans('Warning');

+        if ($titlealt == 'default') {
+                    $titlealt = $langs->trans('Warning');
+        }
 

 //return '<div class="imglatecoin">'.img_picto($titlealt, 'warning_white.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt): '')).'</div>';

         return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"' . ($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' ' . $moreatt) : ''));

@@ -3390,8 +3554,9 @@ 
     {

        // global Globals::$conf, $langs;

 

-        if ($titlealt == 'default')

-            $titlealt = $langs->trans('Error');

+        if ($titlealt == 'default') {
+                    $titlealt = $langs->trans('Error');
+        }
 

         return img_picto($titlealt, 'error.png', 'class="valigntextbottom"');

     }

@@ -3407,8 +3572,9 @@ 
     {

        // global Globals::$conf, $langs;

 

-        if ($titlealt == 'default')

-            $titlealt = $langs->trans('Next');

+        if ($titlealt == 'default') {
+                    $titlealt = $langs->trans('Next');
+        }
 

 //return img_picto($titlealt, 'next.png', $moreatt);

         return '<span class="fa fa-chevron-right paddingright paddingleft" title="' . dol_escape_htmltag($titlealt) . '"></span>';

@@ -3425,8 +3591,9 @@ 
     {

        // global Globals::$conf, $langs;

 

-        if ($titlealt == 'default')

-            $titlealt = $langs->trans('Previous');

+        if ($titlealt == 'default') {
+                    $titlealt = $langs->trans('Previous');
+        }
 

 //return img_picto($titlealt, 'previous.png', $moreatt);

         return '<span class="fa fa-chevron-left paddingright paddingleft" title="' . dol_escape_htmltag($titlealt) . '"></span>';

@@ -3444,8 +3611,9 @@ 
     {

        // global Globals::$conf, $langs;

 

-        if ($titlealt == 'default')

-            $titlealt = $langs->trans('Down');

+        if ($titlealt == 'default') {
+                    $titlealt = $langs->trans('Down');
+        }
 

         return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown' . ($moreclass ? " " . $moreclass : "") . '"');

     }

@@ -3462,8 +3630,9 @@ 
     {

        // global Globals::$conf, $langs;

 

-        if ($titlealt == 'default')

-            $titlealt = $langs->trans('Up');

+        if ($titlealt == 'default') {
+                    $titlealt = $langs->trans('Up');
+        }
 

         return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup' . ($moreclass ? " " . $moreclass : "") . '"');

     }

@@ -3480,8 +3649,9 @@ 
     {

        // global Globals::$conf, $langs;

 

-        if ($titlealt == 'default')

-            $titlealt = $langs->trans('Left');

+        if ($titlealt == 'default') {
+                    $titlealt = $langs->trans('Left');
+        }
 

         return img_picto($titlealt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'), $moreatt);

     }

@@ -3498,8 +3668,9 @@ 
     {

        // global Globals::$conf, $langs;

 

-        if ($titlealt == 'default')

-            $titlealt = $langs->trans('Right');

+        if ($titlealt == 'default') {
+                    $titlealt = $langs->trans('Right');
+        }
 

         return img_picto($titlealt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'), $moreatt);

     }

@@ -3515,11 +3686,13 @@ 
     {

        // global Globals::$conf, $langs;

 

-        if ($titlealt == 'default')

-            $titlealt = $langs->trans('Active');

+        if ($titlealt == 'default') {
+                    $titlealt = $langs->trans('Active');
+        }
 

-        if ($allow == 1)

-            return img_picto($titlealt, 'tick.png');

+        if ($allow == 1) {
+                    return img_picto($titlealt, 'tick.png');
+        }
 

         return '-';

     }

@@ -3567,8 +3740,9 @@ 
         $mimeimg = dol_mimetype($file, '', 2);

         $mimefa = dol_mimetype($file, '', 4);

 

-        if (empty($titlealt))

-            $titlealt = 'Mime type: ' . $mimetype;

+        if (empty($titlealt)) {
+                    $titlealt = 'Mime type: ' . $mimetype;
+        }
 

 //return img_picto_common($titlealt, 'mime/'.$mimeimg, 'class="'.$morecss.'"');

         return '<i class="fa fa-' . $mimefa . ' paddingright"></i>';

@@ -3590,13 +3764,15 @@ 
 

        // global Globals::$conf, $langs;

 

-        if ($titlealt == 'default')

-            $titlealt = $langs->trans('Call');

+        if ($titlealt == 'default') {
+                    $titlealt = $langs->trans('Call');
+        }
 

-        if ($option == 1)

-            $img = 'call';

-        else

-            $img = 'call_out';

+        if ($option == 1) {
+                    $img = 'call';
+        } else {
+                    $img = 'call_out';
+        }
 

         return img_picto($titlealt, $img);

     }

@@ -3612,8 +3788,9 @@ 
     {

        // global Globals::$conf, $langs;

 

-        if ($titlealt == 'default')

-            $titlealt = $langs->trans('Search');

+        if ($titlealt == 'default') {
+                    $titlealt = $langs->trans('Search');
+        }
 

         $img = img_picto($titlealt, 'search.png', $other, false, 1);

 

@@ -3634,8 +3811,9 @@ 
     {

        // global Globals::$conf, $langs;

 

-        if ($titlealt == 'default')

-            $titlealt = $langs->trans('Search');

+        if ($titlealt == 'default') {
+                    $titlealt = $langs->trans('Search');
+        }
 

         $img = img_picto($titlealt, 'searchclear.png', $other, false, 1);

 

@@ -3697,14 +3875,16 @@ 
 

         if ($_SERVER['DOCUMENT_ROOT']) {    // Mode web

             $out .= $langs->trans("DolibarrHasDetectedError") . ".<br>\n";

-            if (!empty(Globals::$conf->global->MAIN_FEATURES_LEVEL))

-                $out .= "You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";

+            if (!empty(Globals::$conf->global->MAIN_FEATURES_LEVEL)) {
+                            $out .= "You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";
+            }
             $out .= $langs->trans("InformationToHelpDiagnose") . ":<br>\n";

 

             $out .= "<b>" . $langs->trans("Date") . ":</b> " . dol_print_date(time(), 'dayhourlog') . "<br>\n";

             $out .= "<b>" . $langs->trans("Dolibarr") . ":</b> " . DOL_VERSION . "<br>\n";

-            if (isset(Globals::$conf->global->MAIN_FEATURES_LEVEL))

-                $out .= "<b>" . $langs->trans("LevelOfFeature") . ":</b> " . Globals::$conf->global->MAIN_FEATURES_LEVEL . "<br>\n";

+            if (isset(Globals::$conf->global->MAIN_FEATURES_LEVEL)) {
+                            $out .= "<b>" . $langs->trans("LevelOfFeature") . ":</b> " . Globals::$conf->global->MAIN_FEATURES_LEVEL . "<br>\n";
+            }
             if (function_exists("phpversion")) {

                 $out .= "<b>" . $langs->trans("PHP") . ":</b> " . phpversion() . "<br>\n";

             }

@@ -3747,18 +3927,20 @@ 
             $langs->load("errors");

 

 // Merge all into $errors array

-            if (is_array($error) && is_array($errors))

-                $errors = array_merge($error, $errors);

-            elseif (is_array($error))

-                $errors = $error;

-            elseif (is_array($errors))

-                $errors = array_merge(array($error), $errors);

-            else

-                $errors = array_merge(array($error));

+            if (is_array($error) && is_array($errors)) {
+                            $errors = array_merge($error, $errors);
+            } elseif (is_array($error)) {
+                            $errors = $error;
+            } elseif (is_array($errors)) {
+                            $errors = array_merge(array($error), $errors);
+            } else {
+                            $errors = array_merge(array($error));
+            }
 

             foreach ($errors as $msg) {

-                if (empty($msg))

-                    continue;

+                if (empty($msg)) {
+                                    continue;
+                }
                 if ($_SERVER['DOCUMENT_ROOT']) {  // Mode web

                     $out .= "<b>" . $langs->trans("Message") . ":</b> " . dol_escape_htmltag($msg) . "<br>\n";

                 } else {                        // Mode CLI

@@ -3776,9 +3958,9 @@ 
             $out .= "<br>\n";

         }

 

-        if (empty($dolibarr_main_prod))

-            print $out;

-        else {

+        if (empty($dolibarr_main_prod)) {
+                    print $out;
+        } else {

             print $langs->trans("DolibarrHasDetectedError") . '. ';

             print $langs->trans("YouCanSetOptionDolibarrMainProdToZero");

             define("MAIN_CORE_ERROR", 1);

@@ -3801,16 +3983,18 @@ 
     {

        // global $langs, Globals::$conf;

 

-        if (empty($email))

-            $email = Globals::$conf->global->MAIN_INFO_SOCIETE_MAIL;

+        if (empty($email)) {
+                    $email = Globals::$conf->global->MAIN_INFO_SOCIETE_MAIL;
+        }
 

         $langs->load("errors");

         $now = dol_now();

 

         print '<br><div class="center login_main_message"><div class="' . $morecss . '">';

         print $langs->trans("ErrorContactEMail", $email, $prefixcode . dol_print_date($now, '%Y%m%d'));

-        if ($errormessage)

-            print '<br><br>' . $errormessage;

+        if ($errormessage) {
+                    print '<br><br>' . $errormessage;
+        }
         if (is_array($errormessages) && count($errormessages)) {

             foreach ($errormessages as $mesgtoshow) {

                 print '<br><br>' . $mesgtoshow;

@@ -4053,12 +4237,15 @@ 
         $savtotalnboflines = $totalnboflines;

         $totalnboflines = abs($totalnboflines);

 

-        if ($picto == 'setup')

-            $picto = 'title_setup.png';

-        if ((Globals::$conf->browser->name == 'ie') && $picto == 'title_generic.png')

-            $picto = 'title.gif';

-        if ($limit < 0)

-            $limit = Globals::$conf->liste_limit;

+        if ($picto == 'setup') {
+                    $picto = 'title_setup.png';
+        }
+        if ((Globals::$conf->browser->name == 'ie') && $picto == 'title_generic.png') {
+                    $picto = 'title.gif';
+        }
+        if ($limit < 0) {
+                    $limit = Globals::$conf->liste_limit;
+        }
         if ($savlimit != 0 && (($num > $limit) || ($num == -1) || ($limit == 0))) {

             $nextpage = 1;

         } else {

@@ -4072,11 +4259,13 @@ 
 // Left

 //if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, 'id="pictotitle"', $pictoisfullpath).'</td>';

         print '<td class="nobordernopadding valignmiddle">';

-        if ($picto && $titre)

-            print img_picto('', $picto, 'class="hideonsmartphone valignmiddle opacityhigh pictotitle widthpictotitle"', $pictoisfullpath);

+        if ($picto && $titre) {
+                    print img_picto('', $picto, 'class="hideonsmartphone valignmiddle opacityhigh pictotitle widthpictotitle"', $pictoisfullpath);
+        }
         print '<div class="titre inline-block">' . $titre;

-        if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '')

-            print ' (' . $totalnboflines . ')';

+        if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') {
+                    print ' (' . $totalnboflines . ')';
+        }
         print '</div></td>';

 

 // Center

@@ -4086,21 +4275,24 @@ 
 

 // Right

         print '<td class="nobordernopadding valignmiddle" align="right">';

-        if ($sortfield)

-            $options .= "&sortfield=" . urlencode($sortfield);

-        if ($sortorder)

-            $options .= "&sortorder=" . urlencode($sortorder);

-// Show navigation bar

+        if ($sortfield) {
+                    $options .= "&sortfield=" . urlencode($sortfield);
+        }
+        if ($sortorder) {
+                    $options .= "&sortorder=" . urlencode($sortorder);
+        }
+        // Show navigation bar

         $pagelist = '';

         if ($savlimit != 0 && ($page > 0 || $num > $limit)) {

             if ($totalnboflines) { // If we know total nb of lines

 // Define nb of extra page links before and after selected page + ... + first or last

                 $maxnbofpage = (empty(Globals::$conf->dol_optimize_smallscreen) ? 4 : 1);

 

-                if ($limit > 0)

-                    $nbpages = ceil($totalnboflines / $limit);

-                else

-                    $nbpages = 1;

+                if ($limit > 0) {
+                                    $nbpages = ceil($totalnboflines / $limit);
+                } else {
+                                    $nbpages = 1;
+                }
                 $cpt = ($page - $maxnbofpage);

                 if ($cpt < 0) {

                     $cpt = 0;

@@ -4108,10 +4300,11 @@ 
 

                 if ($cpt >= 1) {

                     $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=0' . $options . '">1</a></li>';

-                    if ($cpt > 2)

-                        $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';

-                    else if ($cpt == 2)

-                        $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=1' . $options . '">2</a></li>';

+                    if ($cpt > 2) {
+                                            $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';
+                    } else if ($cpt == 2) {
+                                            $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=1' . $options . '">2</a></li>';
+                    }
                 }

 

                 do {

@@ -4124,14 +4317,14 @@ 
                 } while ($cpt < $nbpages && $cpt <= $page + $maxnbofpage);

 

                 if ($cpt < $nbpages) {

-                    if ($cpt < $nbpages - 2)

-                        $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';

-                    else if ($cpt == $nbpages - 2)

-                        $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 2) . $options . '">' . ($nbpages - 1) . '</a></li>';

+                    if ($cpt < $nbpages - 2) {
+                                            $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';
+                    } else if ($cpt == $nbpages - 2) {
+                                            $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 2) . $options . '">' . ($nbpages - 1) . '</a></li>';
+                    }
                     $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 1) . $options . '">' . $nbpages . '</a></li>';

                 }

-            }

-            else {

+            } else {

                 $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="active"' : '') . '>' . ($page + 1) . "</li>";

             }

         }

@@ -4167,18 +4360,21 @@ 
             $pagesizechoices = '10:10,15:15,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000,5000:5000';

 //$pagesizechoices.=',0:'.$langs->trans("All");     // Not yet supported

 //$pagesizechoices.=',2:2';

-            if (!empty(Globals::$conf->global->MAIN_PAGESIZE_CHOICES))

-                $pagesizechoices = Globals::$conf->global->MAIN_PAGESIZE_CHOICES;

+            if (!empty(Globals::$conf->global->MAIN_PAGESIZE_CHOICES)) {
+                            $pagesizechoices = Globals::$conf->global->MAIN_PAGESIZE_CHOICES;
+            }
 

             print '<li class="pagination">';

             print '<select class="flat selectlimit" name="limit" title="' . dol_escape_htmltag($langs->trans("MaxNbOfRecordPerPage")) . '">';

             $tmpchoice = explode(',', $pagesizechoices);

             $tmpkey = $limit . ':' . $limit;

-            if (!in_array($tmpkey, $tmpchoice))

-                $tmpchoice[] = $tmpkey;

+            if (!in_array($tmpkey, $tmpchoice)) {
+                            $tmpchoice[] = $tmpkey;
+            }
             $tmpkey = Globals::$conf->liste_limit . ':' . Globals::$conf->liste_limit;

-            if (!in_array($tmpkey, $tmpchoice))

-                $tmpchoice[] = $tmpkey;

+            if (!in_array($tmpkey, $tmpchoice)) {
+                            $tmpchoice[] = $tmpkey;
+            }
             asort($tmpchoice, SORT_NUMERIC);

             $found = false;

             foreach ($tmpchoice as $val) {

@@ -4254,14 +4450,15 @@ 
         }

 

 // If rate is '9/9/9' we don't change it.  If rate is '9.000' we apply price()

-        if (!preg_match('/\//', $rate))

-            $ret = price($rate, 0, '', 0, 0) . ($addpercent ? '%' : '');

-        else {

+        if (!preg_match('/\//', $rate)) {
+                    $ret = price($rate, 0, '', 0, 0) . ($addpercent ? '%' : '');
+        } else {

 // TODO Split on / and output with a price2num to have clean numbers without ton of 000.

             $ret = $rate . ($addpercent ? '%' : '');

         }

-        if (($info_bits & 1) && $usestarfornpr >= 0)

-            $ret .= ' *';

+        if (($info_bits & 1) && $usestarfornpr >= 0) {
+                    $ret .= ' *';
+        }
         $ret .= $morelabel;

         return $ret;

     }

@@ -4285,11 +4482,14 @@ 
     {

        // global $langs, Globals::$conf;

 // Clean parameters

-        if (empty($amount))

-            $amount = 0; // To have a numeric value if amount not defined or = ''

+        if (empty($amount)) {
+                    $amount = 0;
+        }
+        // To have a numeric value if amount not defined or = ''

         $amount = (is_numeric($amount) ? $amount : 0); // Check if amount is numeric, for example, an error occured when amount value = o (letter) instead 0 (number)

-        if ($rounding < 0)

-            $rounding = min(Globals::$conf->global->MAIN_MAX_DECIMALS_UNIT, Globals::$conf->global->MAIN_MAX_DECIMALS_TOT);

+        if ($rounding < 0) {
+                    $rounding = min(Globals::$conf->global->MAIN_MAX_DECIMALS_UNIT, Globals::$conf->global->MAIN_MAX_DECIMALS_TOT);
+        }
         $nbdecimal = $rounding;

 

 // Output separators by default (french)

@@ -4297,18 +4497,22 @@ 
         $thousand = ' ';

 

 // If $outlangs not forced, we use use language

-        if (!is_object($outlangs))

-            $outlangs = $langs;

-

-        if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")

-            $dec = $outlangs->transnoentitiesnoconv("SeparatorDecimal");

-        if ($outlangs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand")

-            $thousand = $outlangs->transnoentitiesnoconv("SeparatorThousand");

-        if ($thousand == 'None')

-            $thousand = '';

-        else if ($thousand == 'Space')

-            $thousand = ' ';

-//print "outlangs=".$outlangs->defaultlang." amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";

+        if (!is_object($outlangs)) {
+                    $outlangs = $langs;
+        }
+

+        if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+                    $dec = $outlangs->transnoentitiesnoconv("SeparatorDecimal");
+        }
+        if ($outlangs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
+                    $thousand = $outlangs->transnoentitiesnoconv("SeparatorThousand");
+        }
+        if ($thousand == 'None') {
+                    $thousand = '';
+        } else if ($thousand == 'Space') {
+                    $thousand = ' ';
+        }
+        //print "outlangs=".$outlangs->defaultlang." amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";

 //print "amount=".$amount."-";

         $amount = str_replace(',', '.', $amount); // should be useless

 //print $amount."-";

@@ -4319,9 +4523,10 @@ 
         $end = '';

 

 // We increase nbdecimal if there is more decimal than asked (to not loose information)

-        if (dol_strlen($decpart) > $nbdecimal)

-            $nbdecimal = dol_strlen($decpart);

-// Si on depasse max

+        if (dol_strlen($decpart) > $nbdecimal) {
+                    $nbdecimal = dol_strlen($decpart);
+        }
+        // Si on depasse max

         if ($trunc && $nbdecimal > Globals::$conf->global->MAIN_MAX_DECIMALS_SHOWN) {

             $nbdecimal = Globals::$conf->global->MAIN_MAX_DECIMALS_SHOWN;

             if (preg_match('/\.\.\./i', Globals::$conf->global->MAIN_MAX_DECIMALS_SHOWN)) {

@@ -4331,8 +4536,9 @@ 
         }

 

 // If force rounding

-        if ($forcerounding >= 0)

-            $nbdecimal = $forcerounding;

+        if ($forcerounding >= 0) {
+                    $nbdecimal = $forcerounding;
+        }
 

 // Format number

         $output = number_format($amount, $nbdecimal, $dec, $thousand);

@@ -4343,13 +4549,14 @@ 
 // Add symbol of currency if requested

         $cursymbolbefore = $cursymbolafter = '';

         if ($currency_code) {

-            if ($currency_code == 'auto')

-                $currency_code = Globals::$conf->currency;

+            if ($currency_code == 'auto') {
+                            $currency_code = Globals::$conf->currency;
+            }
 

             $listofcurrenciesbefore = array('USD', 'GBP', 'AUD', 'MXN', 'PEN', 'CNY');

-            if (in_array($currency_code, $listofcurrenciesbefore))

-                $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);

-            else {

+            if (in_array($currency_code, $listofcurrenciesbefore)) {
+                            $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);
+            } else {

                 $tmpcur = $outlangs->getCurrencySymbol($currency_code);

                 $cursymbolafter .= ($tmpcur == $currency_code ? ' ' . $tmpcur : $tmpcur);

             }

@@ -4382,15 +4589,18 @@ 
 // Decimal delimiter for PHP and database SQL requests must be '.'

         $dec = ',';

         $thousand = ' ';

-        if ($langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")

-            $dec = $langs->transnoentitiesnoconv("SeparatorDecimal");

-        if ($langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand")

-            $thousand = $langs->transnoentitiesnoconv("SeparatorThousand");

-        if ($thousand == 'None')

-            $thousand = '';

-        elseif ($thousand == 'Space')

-            $thousand = ' ';

-//print "amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";

+        if ($langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+                    $dec = $langs->transnoentitiesnoconv("SeparatorDecimal");
+        }
+        if ($langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
+                    $thousand = $langs->transnoentitiesnoconv("SeparatorThousand");
+        }
+        if ($thousand == 'None') {
+                    $thousand = '';
+        } elseif ($thousand == 'Space') {
+                    $thousand = ' ';
+        }
+        //print "amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";

 // Convert value to universal number format (no thousand separator, '.' as decimal separator)

         if ($alreadysqlnb != 1) { // If not a PHP number or unknown, we change format

 //print 'PP'.$amount.' - '.$dec.' - '.$thousand.' - '.intval($amount).'<br>';

@@ -4405,8 +4615,10 @@ 
             }

 //print "QQ".$amount.'<br>';

 // Now make replace (the main goal of function)

-            if ($thousand != ',' && $thousand != '.')

-                $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users

+            if ($thousand != ',' && $thousand != '.') {
+                            $amount = str_replace(',', '.', $amount);
+            }
+            // To accept 2 notations for french users

             $amount = str_replace(' ', '', $amount);  // To avoid spaces

             $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .

             $amount = str_replace($dec, '.', $amount);

@@ -4415,20 +4627,24 @@ 
 // Now, make a rounding if required

         if ($rounding) {

             $nbofdectoround = '';

-            if ($rounding == 'MU')

-                $nbofdectoround = Globals::$conf->global->MAIN_MAX_DECIMALS_UNIT;

-            elseif ($rounding == 'MT')

-                $nbofdectoround = Globals::$conf->global->MAIN_MAX_DECIMALS_TOT;

-            elseif ($rounding == 'MS')

-                $nbofdectoround = empty(Globals::$conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : Globals::$conf->global->MAIN_MAX_DECIMALS_STOCK;

-            elseif (is_numeric($rounding))

-                $nbofdectoround = $rounding;

-//print "RR".$amount.' - '.$nbofdectoround.'<br>';

-            if (dol_strlen($nbofdectoround))

-                $amount = round($amount, $nbofdectoround); // $nbofdectoround can be 0.

-            else

-                return 'ErrorBadParameterProvidedToFunction';

-//print 'SS'.$amount.' - '.$nbofdec.' - '.$dec.' - '.$thousand.' - '.$nbofdectoround.'<br>';

+            if ($rounding == 'MU') {
+                            $nbofdectoround = Globals::$conf->global->MAIN_MAX_DECIMALS_UNIT;
+            } elseif ($rounding == 'MT') {
+                            $nbofdectoround = Globals::$conf->global->MAIN_MAX_DECIMALS_TOT;
+            } elseif ($rounding == 'MS') {
+                            $nbofdectoround = empty(Globals::$conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : Globals::$conf->global->MAIN_MAX_DECIMALS_STOCK;
+            } elseif (is_numeric($rounding)) {
+                            $nbofdectoround = $rounding;
+            }
+            //print "RR".$amount.' - '.$nbofdectoround.'<br>';

+            if (dol_strlen($nbofdectoround)) {
+                            $amount = round($amount, $nbofdectoround);
+            }
+            // $nbofdectoround can be 0.

+            else {
+                            return 'ErrorBadParameterProvidedToFunction';
+            }
+            //print 'SS'.$amount.' - '.$nbofdec.' - '.$dec.' - '.$thousand.' - '.$nbofdectoround.'<br>';

 // Convert amount to format with dolibarr dec and thousand (this is because PHP convert a number

 // to format defined by LC_NUMERIC after a calculation and we want source format to be defined by Dolibarr setup.

             if (is_numeric($amount)) {

@@ -4441,8 +4657,10 @@ 
 //print "TT".$amount.'<br>';

 // Always make replace because each math static function (like round) replace

 // with local values and we want a number that has a SQL string format x.y

-            if ($thousand != ',' && $thousand != '.')

-                $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users

+            if ($thousand != ',' && $thousand != '.') {
+                            $amount = str_replace(',', '.', $amount);
+            }
+            // To accept 2 notations for french users

             $amount = str_replace(' ', '', $amount);  // To avoid spaces

             $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .

             $amount = str_replace($dec, '.', $amount);

@@ -4501,8 +4719,9 @@ 
     {

        // global $db, Globals::$conf, $mysoc;

 

-        if (empty($thirdparty_seller) || !is_object($thirdparty_seller))

-            $thirdparty_seller = $mysoc;

+        if (empty($thirdparty_seller) || !is_object($thirdparty_seller)) {
+                    $thirdparty_seller = $mysoc;
+        }
 

         dol_syslog("get_localtax tva=" . $vatrate . " local=" . $local . " thirdparty_buyer id=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->id : '') . "/country_code=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->country_code : '') . " thirdparty_seller id=" . $thirdparty_seller->id . "/country_code=" . $thirdparty_seller->country_code . " thirdparty_seller localtax1_assuj=" . $thirdparty_seller->localtax1_assuj . "  thirdparty_seller localtax2_assuj=" . $thirdparty_seller->localtax2_assuj);

 

@@ -4520,37 +4739,43 @@ 
 // Some test to guess with no need to make database access

         if ($mysoc->country_code == 'ES') { // For spain localtaxes 1 and 2, tax is qualified if buyer use local tax

             if ($local == 1) {

-                if (!$mysoc->localtax1_assuj || (string) $vatratecleaned == "0")

-                    return 0;

+                if (!$mysoc->localtax1_assuj || (string) $vatratecleaned == "0") {
+                                    return 0;
+                }
                 if ($thirdparty_seller->id == $mysoc->id) {

-                    if (!$thirdparty_buyer->localtax1_assuj)

-                        return 0;

-                }

-                else {

-                    if (!$thirdparty_seller->localtax1_assuj)

-                        return 0;

+                    if (!$thirdparty_buyer->localtax1_assuj) {
+                                            return 0;
+                    }
+                } else {

+                    if (!$thirdparty_seller->localtax1_assuj) {
+                                            return 0;
+                    }
                 }

             }

 

             if ($local == 2) {

 //if (! $mysoc->localtax2_assuj || (string) $vatratecleaned == "0") return 0;

-                if (!$mysoc->localtax2_assuj)

-                    return 0;  // If main vat is 0, IRPF may be different than 0.

+                if (!$mysoc->localtax2_assuj) {
+                                    return 0;
+                }
+                // If main vat is 0, IRPF may be different than 0.

                 if ($thirdparty_seller->id == $mysoc->id) {

-                    if (!$thirdparty_buyer->localtax2_assuj)

-                        return 0;

-                }

-                else {

-                    if (!$thirdparty_seller->localtax2_assuj)

-                        return 0;

+                    if (!$thirdparty_buyer->localtax2_assuj) {
+                                            return 0;
+                    }
+                } else {

+                    if (!$thirdparty_seller->localtax2_assuj) {
+                                            return 0;
+                    }
                 }

             }

-        }

-        else {

-            if ($local == 1 && !$thirdparty_seller->localtax1_assuj)

-                return 0;

-            if ($local == 2 && !$thirdparty_seller->localtax2_assuj)

-                return 0;

+        } else {

+            if ($local == 1 && !$thirdparty_seller->localtax1_assuj) {
+                            return 0;
+            }
+            if ($local == 2 && !$thirdparty_seller->localtax2_assuj) {
+                            return 0;
+            }
         }

 

 // For some country MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY is forced to on.

@@ -4592,19 +4817,23 @@ 
         $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";

         $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $thirdparty_seller->country_code . "'";

         $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

-        if ($vatratecode)

-            $sql .= " AND t.code ='" . $vatratecode . "'";  // If we have the code, we use it in priority

-        else

-            $sql .= " AND t.recuperableonly ='" . $vatnpr . "'";

+        if ($vatratecode) {
+                    $sql .= " AND t.code ='" . $vatratecode . "'";
+        }
+        // If we have the code, we use it in priority

+        else {
+                    $sql .= " AND t.recuperableonly ='" . $vatnpr . "'";
+        }
         dol_syslog("get_localtax", LOG_DEBUG);

         $resql = $db->query($sql);

 

         if ($resql) {

             $obj = $db->fetch_object($resql);

-            if ($local == 1)

-                return $obj->localtax1;

-            elseif ($local == 2)

-                return $obj->localtax2;

+            if ($local == 1) {
+                            return $obj->localtax1;
+            } elseif ($local == 2) {
+                            return $obj->localtax2;
+            }
         }

 

         return 0;

@@ -4650,10 +4879,11 @@ 
         $resql = $db->query($sql);

         if ($resql) {

             $obj = $db->fetch_object($resql);

-            if ($local == 1)

-                return $obj->localtax1;

-            elseif ($local == 2)

-                return $obj->localtax2;

+            if ($local == 1) {
+                            return $obj->localtax1;
+            } elseif ($local == 2) {
+                            return $obj->localtax2;
+            }
         }

 

         return 0;

@@ -4679,9 +4909,9 @@ 
 // Search local taxes

         $sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr, t.accountancy_code_sell, t.accountancy_code_buy";

         $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";

-        if ($firstparamisid)

-            $sql .= " WHERE t.rowid = " . (int) $vatrate;

-        else {

+        if ($firstparamisid) {
+                    $sql .= " WHERE t.rowid = " . (int) $vatrate;
+        } else {

             $vatratecleaned = $vatrate;

             $vatratecode = '';

             if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {      // If vat is "xx (yy)"

@@ -4694,19 +4924,22 @@ 
               else $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'"; */

             $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";

             $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

-            if ($vatratecode)

-                $sql .= " AND t.code = '" . $vatratecode . "'";

+            if ($vatratecode) {
+                            $sql .= " AND t.code = '" . $vatratecode . "'";
+            }
         }

 

         $resql = $db->query($sql);

         if ($resql) {

             $obj = $db->fetch_object($resql);

-            if ($obj)

-                return array('rowid' => $obj->rowid, 'code' => $obj->code, 'rate' => $obj->rate, 'npr' => $obj->npr, 'accountancy_code_sell' => $obj->accountancy_code_sell, 'accountancy_code_buy' => $obj->accountancy_code_buy);

-            else

-                return array();

-        } else

-            dol_print_error($db);

+            if ($obj) {
+                            return array('rowid' => $obj->rowid, 'code' => $obj->code, 'rate' => $obj->rate, 'npr' => $obj->npr, 'accountancy_code_sell' => $obj->accountancy_code_sell, 'accountancy_code_buy' => $obj->accountancy_code_buy);
+            } else {
+                            return array();
+            }
+        } else {
+                    dol_print_error($db);
+        }
 

         return array();

     }

@@ -4736,9 +4969,9 @@ 
 // Search local taxes

         $sql = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";

         $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";

-        if ($firstparamisid)

-            $sql .= " WHERE t.rowid = " . (int) $vatrate;

-        else {

+        if ($firstparamisid) {
+                    $sql .= " WHERE t.rowid = " . (int) $vatrate;
+        } else {

             $vatratecleaned = $vatrate;

             $vatratecode = '';

             if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {      // If vat is "x.x (yy)"

@@ -4747,13 +4980,17 @@ 
             }

 

             $sql .= ", " . MAIN_DB_PREFIX . "c_country as c";

-            if ($mysoc->country_code == 'ES')

-                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $buyer->country_code . "'";    // local tax in spain use the buyer country ??

-            else

-                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";

+            if ($mysoc->country_code == 'ES') {
+                            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $buyer->country_code . "'";
+            }
+            // local tax in spain use the buyer country ??

+            else {
+                            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";
+            }
             $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

-            if ($vatratecode)

-                $sql .= " AND t.code = '" . $vatratecode . "'";

+            if ($vatratecode) {
+                            $sql .= " AND t.code = '" . $vatratecode . "'";
+            }
         }

 

         $resql = $db->query($sql);

@@ -4799,17 +5036,17 @@ 
                 if ($idprodfournprice > 0) {     // We want vat for product for a "supplier" object

                     $product->get_buyprice($idprodfournprice, 0, 0, 0);

                     $ret = $product->vatrate_supplier;

-                    if ($product->default_vat_code)

-                        $ret .= ' (' . $product->default_vat_code . ')';

-                }

-                else {

+                    if ($product->default_vat_code) {
+                                            $ret .= ' (' . $product->default_vat_code . ')';
+                    }
+                } else {

                     $ret = $product->tva_tx;    // Default vat of product we defined

-                    if ($product->default_vat_code)

-                        $ret .= ' (' . $product->default_vat_code . ')';

+                    if ($product->default_vat_code) {
+                                            $ret .= ' (' . $product->default_vat_code . ')';
+                    }
                 }

                 $found = 1;

-            }

-            else {

+            } else {

 // TODO Read default product vat according to countrycode and product. Vat for couple countrycode/product is a feature not implemeted yet.

 // May be usefull/required if hidden option SERVICE_ARE_ECOMMERCE_200238EC is on

             }

@@ -4829,14 +5066,18 @@ 
                     $obj = $db->fetch_object($resql);

                     if ($obj) {

                         $ret = $obj->vat_rate;

-                        if ($obj->default_vat_code)

-                            $ret .= ' (' . $obj->default_vat_code . ')';

+                        if ($obj->default_vat_code) {
+                                                    $ret .= ' (' . $obj->default_vat_code . ')';
+                        }
                     }

                     $db->free($sql);

-                } else

-                    dol_print_error($db);

-            } else

-                $ret = Globals::$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;    // Forced value if autodetect fails

+                } else {
+                                    dol_print_error($db);
+                }
+            } else {
+                            $ret = Globals::$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;
+            }
+            // Forced value if autodetect fails

         }

 

         dol_syslog("get_product_vat_for_country: ret=" . $ret);

@@ -4891,13 +5132,15 @@ 
             if ($resql) {

                 $obj = $db->fetch_object($resql);

                 if ($obj) {

-                    if ($local == 1)

-                        $ret = $obj->localtax1;

-                    elseif ($local == 2)

-                        $ret = $obj->localtax2;

+                    if ($local == 1) {
+                                            $ret = $obj->localtax1;
+                    } elseif ($local == 2) {
+                                            $ret = $obj->localtax2;
+                    }
                 }

-            } else

-                dol_print_error($db);

+            } else {
+                            dol_print_error($db);
+            }
         }

 

         dol_syslog("get_product_localtax_for_country: ret=" . $ret);

@@ -5000,15 +5243,16 @@ 
        // global $db;

 

         if ($idprodfournprice > 0) {

-            if (!class_exists('ProductFournisseur'))

-                require_once DOL_BASE_PATH . '/fourn/class/fournisseur.product.class.php';

+            if (!class_exists('ProductFournisseur')) {
+                            require_once DOL_BASE_PATH . '/fourn/class/fournisseur.product.class.php';
+            }
             $prodprice = new ProductFournisseur($db);

             $prodprice->fetch_product_fournisseur_price($idprodfournprice);

             return $prodprice->fourn_tva_npr;

-        }

-        elseif ($idprod > 0) {

-            if (!class_exists('Product'))

-                require_once DOL_BASE_PATH . 'product/class/product.class.php';

+        } elseif ($idprod > 0) {

+            if (!class_exists('Product')) {
+                            require_once DOL_BASE_PATH . 'product/class/product.class.php';
+            }
             $prod = new Product($db);

             $prod->fetch($idprod);

             return $prod->tva_npr;

@@ -5034,30 +5278,35 @@ 
     {

        // global $mysoc;

 

-        if (!is_object($thirdparty_seller))

-            return -1;

-        if (!is_object($thirdparty_buyer))

-            return -1;

+        if (!is_object($thirdparty_seller)) {
+                    return -1;
+        }
+        if (!is_object($thirdparty_buyer)) {
+                    return -1;
+        }
 

         if ($local == 1) { // Localtax 1

             if ($mysoc->country_code == 'ES') {

-                if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj)

-                    return 0;

-            }

-            else {

+                if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj) {
+                                    return 0;
+                }
+            } else {

 // Si vendeur non assujeti a Localtax1, localtax1 par default=0

-                if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj)

-                    return 0;

-                if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off')

-                    return 0;

-            }

-        }

-        elseif ($local == 2) { //I Localtax 2

+                if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj) {
+                                    return 0;
+                }
+                if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off') {
+                                    return 0;
+                }
+            }

+        } elseif ($local == 2) { //I Localtax 2

 // Si vendeur non assujeti a Localtax2, localtax2 par default=0

-            if (is_numeric($thirdparty_seller->localtax2_assuj) && !$thirdparty_seller->localtax2_assuj)

-                return 0;

-            if (!is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj == 'localtax2off')

-                return 0;

+            if (is_numeric($thirdparty_seller->localtax2_assuj) && !$thirdparty_seller->localtax2_assuj) {
+                            return 0;
+            }
+            if (!is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj == 'localtax2off') {
+                            return 0;
+            }
         }

 

         if ($thirdparty_seller->country_code == $thirdparty_buyer->country_code) {

@@ -5082,31 +5331,38 @@ 
         $classname = '';

         if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') {  // A mettre avant test sur no a cause du == 0

             $result = $langs->trans('yes');

-            if ($case == 1 || $case == 3)

-                $result = $langs->trans("Yes");

-            if ($case == 2)

-                $result = '<input type="checkbox" value="1" checked disabled>';

-            if ($case == 3)

-                $result = '<input type="checkbox" value="1" checked disabled> ' . $result;

+            if ($case == 1 || $case == 3) {
+                            $result = $langs->trans("Yes");
+            }
+            if ($case == 2) {
+                            $result = '<input type="checkbox" value="1" checked disabled>';
+            }
+            if ($case == 3) {
+                            $result = '<input type="checkbox" value="1" checked disabled> ' . $result;
+            }
 

             $classname = 'ok';

-        }

-        elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false') {

+        } elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false') {

             $result = $langs->trans("no");

-            if ($case == 1 || $case == 3)

-                $result = $langs->trans("No");

-            if ($case == 2)

-                $result = '<input type="checkbox" value="0" disabled>';

-            if ($case == 3)

-                $result = '<input type="checkbox" value="0" disabled> ' . $result;

-

-            if ($color == 2)

-                $classname = 'ok';

-            else

-                $classname = 'error';

-        }

-        if ($color)

-            return '<font class="' . $classname . '">' . $result . '</font>';

+            if ($case == 1 || $case == 3) {
+                            $result = $langs->trans("No");
+            }
+            if ($case == 2) {
+                            $result = '<input type="checkbox" value="0" disabled>';
+            }
+            if ($case == 3) {
+                            $result = '<input type="checkbox" value="0" disabled> ' . $result;
+            }
+

+            if ($color == 2) {
+                            $classname = 'ok';
+            } else {
+                            $classname = 'error';
+            }
+        }

+        if ($color) {
+                    return '<font class="' . $classname . '">' . $result . '</font>';
+        }
         return $result;

     }

 

@@ -5132,23 +5388,27 @@ 
         $path = '';

 

         $arrayforoldpath = array('cheque', 'user', 'category', 'holiday', 'supplier_invoice', 'invoice_supplier', 'mailing', 'supplier_payment');

-        if (!empty(Globals::$conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))

-            $arrayforoldpath[] = 'product';

+        if (!empty(Globals::$conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+                    $arrayforoldpath[] = 'product';
+        }
         if (!empty($level) && in_array($modulepart, $arrayforoldpath)) {

 // This part should be removed once all code is using "get_exdir" to forge path, with all parameters provided.

-            if (empty($alpha))

-                $num = preg_replace('/([^0-9])/i', '', $num);

-            else

-                $num = preg_replace('/^.*\-/i', '', $num);

+            if (empty($alpha)) {
+                            $num = preg_replace('/([^0-9])/i', '', $num);
+            } else {
+                            $num = preg_replace('/^.*\-/i', '', $num);
+            }
             $num = substr("000" . $num, -$level);

-            if ($level == 1)

-                $path = substr($num, 0, 1);

-            if ($level == 2)

-                $path = substr($num, 1, 1) . '/' . substr($num, 0, 1);

-            if ($level == 3)

-                $path = substr($num, 2, 1) . '/' . substr($num, 1, 1) . '/' . substr($num, 0, 1);

-        }

-        else {

+            if ($level == 1) {
+                            $path = substr($num, 0, 1);
+            }
+            if ($level == 2) {
+                            $path = substr($num, 1, 1) . '/' . substr($num, 0, 1);
+            }
+            if ($level == 3) {
+                            $path = substr($num, 2, 1) . '/' . substr($num, 1, 1) . '/' . substr($num, 0, 1);
+            }
+        } else {

 // TODO

 // We will enhance here a common way of forging path for document storage

 // Here, object->id, object->ref and modulepart are required.

@@ -5159,8 +5419,9 @@ 
             }

         }

 

-        if (empty($withoutslash) && !empty($path))

-            $path .= '/';

+        if (empty($withoutslash) && !empty($path)) {
+                    $path .= '/';
+        }
 

         return $path;

     }

@@ -5180,8 +5441,9 @@ 
         dol_syslog("functions.lib::dol_mkdir: dir=" . $dir, LOG_INFO);

 

         $dir_osencoded = dol_osencode($dir);

-        if (@is_dir($dir_osencoded))

-            return 0;

+        if (@is_dir($dir_osencoded)) {
+                    return 0;
+        }
 

         $nberr = 0;

         $nbcreated = 0;

@@ -5196,12 +5458,15 @@ 
         $cdir = explode("/", $dir);

         $num = count($cdir);

         for ($i = 0; $i < $num; $i++) {

-            if ($i > 0)

-                $ccdir .= '/' . $cdir[$i];

-            else

-                $ccdir .= $cdir[$i];

-            if (preg_match("/^.:$/", $ccdir, $regs))

-                continue; // Si chemin Windows incomplet, on poursuit par rep suivant

+            if ($i > 0) {
+                            $ccdir .= '/' . $cdir[$i];
+            } else {
+                            $ccdir .= $cdir[$i];
+            }
+            if (preg_match("/^.:$/", $ccdir, $regs)) {
+                            continue;
+            }
+            // Si chemin Windows incomplet, on poursuit par rep suivant

 

 

 

@@ -5293,8 +5558,9 @@ 
      */

     static function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto = 'UTF-8', $strip_tags = 0)

     {

-        if ($removelinefeed == 2)

-            $stringtoclean = preg_replace('/<br[^>]*>\n+/ims', '<br>', $stringtoclean);

+        if ($removelinefeed == 2) {
+                    $stringtoclean = preg_replace('/<br[^>]*>\n+/ims', '<br>', $stringtoclean);
+        }
         $temp = preg_replace('/<br[^>]*>/i', "\n", $stringtoclean);

 

         if ($strip_tags) {

@@ -5311,8 +5577,9 @@ 
         $temp = dol_html_entity_decode($temp, ENT_COMPAT, $pagecodeto);

 

 // Supprime aussi les retours

-        if ($removelinefeed == 1)

-            $temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);

+        if ($removelinefeed == 1) {
+                    $temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);
+        }
 

 // et les espaces doubles

         while (strpos($temp, "  ")) {

@@ -5398,18 +5665,21 @@ 
             if ($charset == 'UTF-8') {

                 $pattern = '/(<br[^>]*>)/Uu';

             } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support

-            else

-                $pattern = '/(<br[^>]*>)/U';       // /U is to have UNGREEDY regex to limit to one html tag.

+            else {
+                            $pattern = '/(<br[^>]*>)/U';
+            }
+            // /U is to have UNGREEDY regex to limit to one html tag.

             $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);

 

             $firstline = '';

             $i = 0;

             $nba = count($a); // 2x nb of lines in $a because $a contains also a line for each new line separator

             while (($i < $nba) && ($i < ($nboflines * 2))) {

-                if ($i % 2 == 0)

-                    $firstline .= $a[$i];

-                elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1)))

-                    $firstline .= ($ishtml ? "<br>\n" : "\n");

+                if ($i % 2 == 0) {
+                                    $firstline .= $a[$i];
+                } elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1))) {
+                                    $firstline .= ($ishtml ? "<br>\n" : "\n");
+                }
                 $i++;

             }

             unset($a);

@@ -5458,15 +5728,18 @@ 
         $newstring = $stringtoencode;

         if (dol_textishtml($stringtoencode)) { // Check if text is already HTML or not

             $newstring = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', $newstring); // Replace "<br type="_moz" />" by "<br>". It's same and avoid pb with FPDF.

-            if ($removelasteolbr)

-                $newstring = preg_replace('/<br>$/i', '', $newstring); // Remove last <br> (remove only last one)

+            if ($removelasteolbr) {
+                            $newstring = preg_replace('/<br>$/i', '', $newstring);
+            }
+            // Remove last <br> (remove only last one)

             $newstring = strtr($newstring, array('&' => '__and__', '<' => '__lt__', '>' => '__gt__', '"' => '__dquot__'));

             $newstring = dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom); // Make entity encoding

             $newstring = strtr($newstring, array('__and__' => '&', '__lt__' => '<', '__gt__' => '>', '__dquot__' => '"'));

-        }

-        else {

-            if ($removelasteolbr)

-                $newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring); // Remove last \n (may remove several)

+        } else {

+            if ($removelasteolbr) {
+                            $newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring);
+            }
+            // Remove last \n (may remove several)

             $newstring = dol_nl2br(dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom), $nl2brmode);

         }

 // Other substitutions that htmlentities does not do

@@ -5568,8 +5841,9 @@ 
      */

     static function dol_nboflines($s, $maxchar = 0)

     {

-        if ($s == '')

-            return 0;

+        if ($s == '') {
+                    return 0;
+        }
         $arraystring = explode("\n", $s);

         $nb = count($arraystring);

 

@@ -5588,15 +5862,18 @@ 
     static function dol_nboflines_bis($text, $maxlinesize = 0, $charset = 'UTF-8')

     {

         $repTable = array("\t" => " ", "\n" => "<br>", "\r" => " ", "\0" => " ", "\x0B" => " ");

-        if (dol_textishtml($text))

-            $repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");

+        if (dol_textishtml($text)) {
+                    $repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
+        }
 

         $text = strtr($text, $repTable);

         if ($charset == 'UTF-8') {

             $pattern = '/(<br[^>]*>)/Uu';

         } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support

-        else

-            $pattern = '/(<br[^>]*>)/U';       // /U is to have UNGREEDY regex to limit to one html tag.

+        else {
+                    $pattern = '/(<br[^>]*>)/U';
+        }
+        // /U is to have UNGREEDY regex to limit to one html tag.

         $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);

 

         $nblines = (int) floor((count($a) + 1) / 2);

@@ -5643,39 +5920,47 @@ 
     static function dol_textishtml($msg, $option = 0)

     {

         if ($option == 1) {

-            if (preg_match('/<html/i', $msg))

-                return true;

-            elseif (preg_match('/<body/i', $msg))

-                return true;

-            elseif (preg_match('/<br/i', $msg))

-                return true;

+            if (preg_match('/<html/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<body/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<br/i', $msg)) {
+                            return true;
+            }
             return false;

-        }

-        else {

-            if (preg_match('/<html/i', $msg))

-                return true;

-            elseif (preg_match('/<body/i', $msg))

-                return true;

-            elseif (preg_match('/<(b|em|i|u)>/i', $msg))

-                return true;

-            elseif (preg_match('/<br\/>/i', $msg))

-                return true;

-            elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i', $msg))

-                return true;

-            elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i', $msg))

-                return true;

-            elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i', $msg))

-                return true;

-            elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i', $msg))

-                return true; // must accept <img src="http://example.com/aaa.png" />

-            elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i', $msg))

-                return true; // must accept <a href="http://example.com/aaa.png" />

-            elseif (preg_match('/<h[0-9]>/i', $msg))

-                return true;

-            elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg))

-                return true;    // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)

-            elseif (preg_match('/&#[0-9]{2,3};/i', $msg))

-                return true;    // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)

+        } else {

+            if (preg_match('/<html/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<body/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<(b|em|i|u)>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<br\/>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i', $msg)) {
+                            return true;
+            }
+            // must accept <img src="http://example.com/aaa.png" />

+            elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i', $msg)) {
+                            return true;
+            }
+            // must accept <a href="http://example.com/aaa.png" />

+            elseif (preg_match('/<h[0-9]>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg)) {
+                            return true;
+            }
+            // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)

+            elseif (preg_match('/&#[0-9]{2,3};/i', $msg)) {
+                            return true;
+            }
+            // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)

 

             return false;

         }

@@ -5827,12 +6112,14 @@ 
                 $birthday = dol_print_date($object->birth, 'day');

 

                 $substitutionarray['__MEMBER_ID__'] = $object->id;

-                if (method_exists($object, 'getCivilityLabel'))

-                    $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();

+                if (method_exists($object, 'getCivilityLabel')) {
+                                    $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();
+                }
                 $substitutionarray['__MEMBER_FIRSTNAME__'] = $msgishtml ? dol_htmlentitiesbr($object->firstname) : $object->firstname;

                 $substitutionarray['__MEMBER_LASTNAME__'] = $msgishtml ? dol_htmlentitiesbr($object->lastname) : $object->lastname;

-                if (method_exists($object, 'getFullName'))

-                    $substitutionarray['__MEMBER_FULLNAME__'] = $msgishtml ? dol_htmlentitiesbr($object->getFullName($outputlangs)) : $object->getFullName($outputlangs);

+                if (method_exists($object, 'getFullName')) {
+                                    $substitutionarray['__MEMBER_FULLNAME__'] = $msgishtml ? dol_htmlentitiesbr($object->getFullName($outputlangs)) : $object->getFullName($outputlangs);
+                }
                 $substitutionarray['__MEMBER_COMPANY__'] = $msgishtml ? dol_htmlentitiesbr($object->societe) : $object->societe;

                 $substitutionarray['__MEMBER_ADDRESS__'] = $msgishtml ? dol_htmlentitiesbr($object->address) : $object->address;

                 $substitutionarray['__MEMBER_ZIP__'] = $msgishtml ? dol_htmlentitiesbr($object->zip) : $object->zip;

@@ -5880,10 +6167,12 @@ 
                     $dateplannedstart = '';

                     $datenextexpiration = '';

                     foreach ($object->lines as $line) {

-                        if ($line->date_ouverture_prevue > $dateplannedstart)

-                            $dateplannedstart = $line->date_ouverture_prevue;

-                        if ($line->statut == 4 && $line->date_fin_prevue && (!$datenextexpiration || $line->date_fin_prevue < $datenextexpiration))

-                            $datenextexpiration = $line->date_fin_prevue;

+                        if ($line->date_ouverture_prevue > $dateplannedstart) {
+                                                    $dateplannedstart = $line->date_ouverture_prevue;
+                        }
+                        if ($line->statut == 4 && $line->date_fin_prevue && (!$datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) {
+                                                    $datenextexpiration = $line->date_fin_prevue;
+                        }
                     }

                     $substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = dol_print_date($dateplannedstart, 'dayrfc');

                     $substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = dol_print_date($dateplannedstart, 'standard');

@@ -5893,8 +6182,9 @@ 
 

 // Create dynamic tags for __EXTRAFIELD_FIELD__

                 if ($object->table_element && $object->id > 0) {

-                    if (!is_object($extrafields))

-                        $extrafields = new ExtraFields($db);

+                    if (!is_object($extrafields)) {
+                                            $extrafields = new ExtraFields($db);
+                    }
                     $extrafields->fetch_name_optionals_label($object->table_element, true);

 

                     if ($object->fetch_optionals() > 0) {

@@ -5915,12 +6205,15 @@ 
                     require_once DOL_BASE_PATH . '/core/lib/payments.lib.php';

                     $outputlangs->loadLangs(array('paypal', 'other'));

                     $typeforonlinepayment = 'free';

-                    if (is_object($object) && $object->element == 'commande')

-                        $typeforonlinepayment = 'order';

-                    if (is_object($object) && $object->element == 'facture')

-                        $typeforonlinepayment = 'invoice';

-                    if (is_object($object) && $object->element == 'member')

-                        $typeforonlinepayment = 'member';

+                    if (is_object($object) && $object->element == 'commande') {
+                                            $typeforonlinepayment = 'order';
+                    }
+                    if (is_object($object) && $object->element == 'facture') {
+                                            $typeforonlinepayment = 'invoice';
+                    }
+                    if (is_object($object) && $object->element == 'member') {
+                                            $typeforonlinepayment = 'member';
+                    }
                     $url = getOnlinePaymentUrl(0, $typeforonlinepayment, $substitutionarray['__REF__']);

                     $paymenturl = $url;

                 }

@@ -5930,16 +6223,19 @@ 
 

                 if (!empty(Globals::$conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'propal') {

                     $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = $object->getLastMainDocLink($object->element);

-                } else

-                    $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';

+                } else {
+                                    $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';
+                }
                 if (!empty(Globals::$conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'commande') {

                     $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = $object->getLastMainDocLink($object->element);

-                } else

-                    $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';

+                } else {
+                                    $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';
+                }
                 if (!empty(Globals::$conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'facture') {

                     $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = $object->getLastMainDocLink($object->element);

-                } else

-                    $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';

+                } else {
+                                    $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';
+                }
             }

         }

         if (empty($exclude) || !in_array('objectamount', $exclude)) {

@@ -5949,18 +6245,22 @@ 
             $substitutionarray['__AMOUNT__'] = is_object($object) ? $object->total_ttc : '';

             $substitutionarray['__AMOUNT_EXCL_TAX__'] = is_object($object) ? $object->total_ht : '';

             $substitutionarray['__AMOUNT_VAT__'] = is_object($object) ? ($object->total_vat ? $object->total_vat : $object->total_tva) : '';

-            if ($onlykey != 2 || $mysoc->useLocalTax(1))

-                $substitutionarray['__AMOUNT_TAX2__'] = is_object($object) ? $object->total_localtax1 : '';

-            if ($onlykey != 2 || $mysoc->useLocalTax(2))

-                $substitutionarray['__AMOUNT_TAX3__'] = is_object($object) ? $object->total_localtax2 : '';

+            if ($onlykey != 2 || $mysoc->useLocalTax(1)) {
+                            $substitutionarray['__AMOUNT_TAX2__'] = is_object($object) ? $object->total_localtax1 : '';
+            }
+            if ($onlykey != 2 || $mysoc->useLocalTax(2)) {
+                            $substitutionarray['__AMOUNT_TAX3__'] = is_object($object) ? $object->total_localtax2 : '';
+            }
 

             $substitutionarray['__AMOUNT_FORMATED__'] = is_object($object) ? price($object->total_ttc, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';

             $substitutionarray['__AMOUNT_EXCL_TAX_FORMATED__'] = is_object($object) ? price($object->total_ht, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';

             $substitutionarray['__AMOUNT_VAT_FORMATED__'] = is_object($object) ? ($object->total_vat ? price($object->total_vat, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : price($object->total_tva, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency)) : '';

-            if ($onlykey != 2 || $mysoc->useLocalTax(1))

-                $substitutionarray['__AMOUNT_TAX2_FORMATED__'] = is_object($object) ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';

-            if ($onlykey != 2 || $mysoc->useLocalTax(2))

-                $substitutionarray['__AMOUNT_TAX3_FORMATED__'] = is_object($object) ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';

+            if ($onlykey != 2 || $mysoc->useLocalTax(1)) {
+                            $substitutionarray['__AMOUNT_TAX2_FORMATED__'] = is_object($object) ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';
+            }
+            if ($onlykey != 2 || $mysoc->useLocalTax(2)) {
+                            $substitutionarray['__AMOUNT_TAX3_FORMATED__'] = is_object($object) ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';
+            }
 

 // TODO Add keys for foreign multicurrency

 // For backward compatibility

@@ -6030,23 +6330,27 @@ 
     {

        // global Globals::$conf, $langs;

 

-        if (!is_array($substitutionarray))

-            return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';

+        if (!is_array($substitutionarray)) {
+                    return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';
+        }
 

-        if (empty($outputlangs))

-            $outputlangs = Globals::$langs;

+        if (empty($outputlangs)) {
+                    $outputlangs = Globals::$langs;
+        }
 

 // Make substitution for language keys

         if (is_object($outputlangs)) {

             while (preg_match('/__\(([^\)]+)\)__/', $text, $reg)) {

                 $msgishtml = 0;

-                if (DolUtils::dol_textishtml($text, 1))

-                    $msgishtml = 1;

+                if (DolUtils::dol_textishtml($text, 1)) {
+                                    $msgishtml = 1;
+                }
 

 // If key is __(TranslationKey|langfile)__, then force load of langfile.lang

                 $tmp = explode('|', $reg[1]);

-                if (!empty($tmp[1]))

-                    $outputlangs->load($tmp[1]);

+                if (!empty($tmp[1])) {
+                                    $outputlangs->load($tmp[1]);
+                }
 

                 $text = preg_replace('/__\(' . preg_quote($reg[1], '/') . '\)__/', $msgishtml ? dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])) : $outputlangs->transnoentitiesnoconv($reg[1]), $text);

             }

@@ -6056,23 +6360,29 @@ 
 // it is also converted.

         while (preg_match('/__\[([^\]]+)\]__/', $text, $reg)) {

             $msgishtml = 0;

-            if (DolUtils::dol_textishtml($text, 1))

-                $msgishtml = 1;

+            if (DolUtils::dol_textishtml($text, 1)) {
+                            $msgishtml = 1;
+            }
 

             $keyfound = $reg[1];

-            if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound))

-                $newval = '*****forbidden*****';

-            else

-                $newval = empty(Globals::$conf->global->$keyfound) ? '' : Globals::$conf->global->$keyfound;

+            if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound)) {
+                            $newval = '*****forbidden*****';
+            } else {
+                            $newval = empty(Globals::$conf->global->$keyfound) ? '' : Globals::$conf->global->$keyfound;
+            }
             $text = preg_replace('/__\[' . preg_quote($keyfound, '/') . '\]__/', $msgishtml ? dol_htmlentitiesbr($newval) : $newval, $text);

         }

 

 // Make substitition for array $substitutionarray

         foreach ($substitutionarray as $key => $value) {

-            if ($key == '__SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))

-                $value = '';  // Protection

-            if ($key == '__USER_SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))

-                $value = ''; // Protection

+            if ($key == '__SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) {
+                            $value = '';
+            }
+            // Protection

+            if ($key == '__USER_SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) {
+                            $value = '';
+            }
+            // Protection

 

             $text = str_replace("$key", "$value", $text); // We must keep the " to work when value is 123.5 for example

         }

@@ -6118,8 +6428,9 @@ 
             $dir = dol_buildpath($reldir, 0);

 

 // Check if directory exists

-            if (!dol_is_dir($dir))

-                continue;

+            if (!dol_is_dir($dir)) {
+                            continue;
+            }
 

             $substitfiles = dol_dir_list($dir, 'files', 0, 'functions_');

             foreach ($substitfiles as $substitfile) {

@@ -6131,8 +6442,9 @@ 
                     require_once $dir . $substitfile['name'];

                     // Call the user's function, and only if it is defined

                     $function_name = $module . "_" . $callfunc;

-                    if (function_exists($function_name))

-                        $function_name($substitutionarray, $outputlangs, $object, $parameters);

+                    if (function_exists($function_name)) {
+                                            $function_name($substitutionarray, $outputlangs, $object, $parameters);
+                    }
                 }

             }

         }

@@ -6168,8 +6480,9 @@ 
 

         $out = '';

 

-        if (!is_object($outputlangs))

-            $outputlangs = $langs;

+        if (!is_object($outputlangs)) {
+                    $outputlangs = $langs;
+        }
 

         if ($date_start && $date_end) {

             $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateFromTo', dol_print_date($date_start, $format, false, $outputlangs), dol_print_date($date_end, $format, false, $outputlangs)) . ($withparenthesis ? ')' : '');

@@ -6198,20 +6511,22 @@ 
 

         $ret = '';

 // If order not defined, we use the setup

-        if ($nameorder < 0)

-            $nameorder = (empty(Globals::$conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0);

+        if ($nameorder < 0) {
+                    $nameorder = (empty(Globals::$conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0);
+        }
         if ($nameorder && ((string) $nameorder != '2')) {

             $ret .= $firstname;

-            if ($firstname && $lastname)

-                $ret .= ' ';

+            if ($firstname && $lastname) {
+                            $ret .= ' ';
+            }
             $ret .= $lastname;

-        }

-        else if ($nameorder == 2) {

+        } else if ($nameorder == 2) {

             $ret .= $firstname;

         } else {

             $ret .= $lastname;

-            if ($firstname && $lastname)

-                $ret .= ' ';

+            if ($firstname && $lastname) {
+                            $ret .= ' ';
+            }
             $ret .= $firstname;

         }

         return $ret;

@@ -6231,13 +6546,14 @@ 
     {

 //dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);		This is not deprecated, it is used by setEventMessages function

         if (!is_array($mesgs)) {  // If mesgs is a string

-            if ($mesgs)

-                $_SESSION['dol_events'][$style][] = $mesgs;

-        }

-        else {      // If mesgs is an array

+            if ($mesgs) {
+                            $_SESSION['dol_events'][$style][] = $mesgs;
+            }
+        } else {      // If mesgs is an array

             foreach ($mesgs as $mesg) {

-                if ($mesg)

-                    $_SESSION['dol_events'][$style][] = $mesg;

+                if ($mesg) {
+                                    $_SESSION['dol_events'][$style][] = $mesg;
+                }
             }

         }

     }

@@ -6257,13 +6573,16 @@ 
         if (empty($mesg) && empty($mesgs)) {

             dol_syslog("Try to add a message in stack with empty message", LOG_WARNING);

         } else {

-            if (!in_array((string) $style, array('mesgs', 'warnings', 'errors')))

-                dol_print_error('', 'Bad parameter style=' . $style . ' for setEventMessages');

-            if (empty($mesgs))

-                setEventMessage($mesg, $style);

-            else {

-                if (!empty($mesg) && !in_array($mesg, $mesgs))

-                    setEventMessage($mesg, $style); // Add message string if not already into array

+            if (!in_array((string) $style, array('mesgs', 'warnings', 'errors'))) {
+                            dol_print_error('', 'Bad parameter style=' . $style . ' for setEventMessages');
+            }
+            if (empty($mesgs)) {
+                            setEventMessage($mesg, $style);
+            } else {

+                if (!empty($mesg) && !in_array($mesg, $mesgs)) {
+                                    setEventMessage($mesg, $style);
+                }
+                // Add message string if not already into array

                 setEventMessage($mesgs, $style);

             }

         }

@@ -6282,22 +6601,25 @@ 
     {

 // Show mesgs

         if (isset($_SESSION['dol_events']['mesgs'])) {

-            if (empty($disabledoutputofmessages))

-                dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']);

+            if (empty($disabledoutputofmessages)) {
+                            dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']);
+            }
             unset($_SESSION['dol_events']['mesgs']);

         }

 

 // Show errors

         if (isset($_SESSION['dol_events']['errors'])) {

-            if (empty($disabledoutputofmessages))

-                dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error');

+            if (empty($disabledoutputofmessages)) {
+                            dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error');
+            }
             unset($_SESSION['dol_events']['errors']);

         }

 

 // Show warnings

         if (isset($_SESSION['dol_events']['warnings'])) {

-            if (empty($disabledoutputofmessages))

-                dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning');

+            if (empty($disabledoutputofmessages)) {
+                            dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning');
+            }
             unset($_SESSION['dol_events']['warnings']);

         }

     }

@@ -6338,8 +6660,9 @@ 
                 foreach ($mesgarray as $message) {

                     $ret++;

                     $out .= $langs->trans($message);

-                    if ($ret < count($mesgarray))

-                        $out .= "<br>\n";

+                    if ($ret < count($mesgarray)) {
+                                            $out .= "<br>\n";
+                    }
                 }

             }

             if ($mesgstring) {

@@ -6405,8 +6728,9 @@ 
      */

     static function dol_htmloutput_mesg($mesgstring = '', $mesgarray = array(), $style = 'ok', $keepembedded = 0)

     {

-        if (empty($mesgstring) && (!is_array($mesgarray) || count($mesgarray) == 0))

-            return;

+        if (empty($mesgstring) && (!is_array($mesgarray) || count($mesgarray) == 0)) {
+                    return;
+        }
 

         $iserror = 0;

         $iswarning = 0;

@@ -6421,14 +6745,17 @@ 
                     break;

                 }

             }

-        } else if ($mesgstring && preg_match('/class="error"/i', $mesgstring))

-            $iserror++;

-        else if ($mesgstring && preg_match('/class="warning"/i', $mesgstring))

-            $iswarning++;

-        if ($style == 'error')

-            $iserror++;

-        if ($style == 'warning')

-            $iswarning++;

+        } else if ($mesgstring && preg_match('/class="error"/i', $mesgstring)) {
+                    $iserror++;
+        } else if ($mesgstring && preg_match('/class="warning"/i', $mesgstring)) {
+                    $iswarning++;
+        }
+        if ($style == 'error') {
+                    $iserror++;
+        }
+        if ($style == 'warning') {
+                    $iswarning++;
+        }
 

         if ($iserror || $iswarning) {

 // Remove div from texts

@@ -6447,8 +6774,9 @@ 
                 $mesgarray = $newmesgarray;

             }

             print get_htmloutput_mesg($mesgstring, $mesgarray, ($iserror ? 'error' : 'warning'), $keepembedded);

-        } else

-            print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);

+        } else {
+                    print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);
+        }
     }

 

     /**

@@ -6489,15 +6817,17 @@ 
             $sizearray = count($array);

             if ($sizearray > 0) {

                 $temp = array();

-                foreach (array_keys($array) as $key)

-                    $temp[$key] = $array[$key][$index];

+                foreach (array_keys($array) as $key) {
+                                    $temp[$key] = $array[$key][$index];
+                }
 

-                if (!$natsort)

-                    ($order == 'asc') ? asort($temp) : arsort($temp);

-                else {

+                if (!$natsort) {
+                                    ($order == 'asc') ? asort($temp) : arsort($temp);
+                } else {

                     ($case_sensitive) ? natsort($temp) : natcasesort($temp);

-                    if ($order != 'asc')

-                        $temp = array_reverse($temp, true);

+                    if ($order != 'asc') {
+                                            $temp = array_reverse($temp, true);
+                    }
                 }

 

                 $sorted = array();

@@ -6523,23 +6853,38 @@ 
 // We must use here a binary strlen static function (so not dol_strlen)

         $strLength = dol_strlen($str);

         for ($i = 0; $i < $strLength; $i++) {

-            if (ord($str[$i]) < 0x80)

-                continue; // 0bbbbbbb

-            elseif ((ord($str[$i]) & 0xE0) == 0xC0)

-                $n = 1; // 110bbbbb

-            elseif ((ord($str[$i]) & 0xF0) == 0xE0)

-                $n = 2; // 1110bbbb

-            elseif ((ord($str[$i]) & 0xF8) == 0xF0)

-                $n = 3; // 11110bbb

-            elseif ((ord($str[$i]) & 0xFC) == 0xF8)

-                $n = 4; // 111110bb

-            elseif ((ord($str[$i]) & 0xFE) == 0xFC)

-                $n = 5; // 1111110b

-            else

-                return false; // Does not match any model

+            if (ord($str[$i]) < 0x80) {
+                            continue;
+            }
+            // 0bbbbbbb

+            elseif ((ord($str[$i]) & 0xE0) == 0xC0) {
+                            $n = 1;
+            }
+            // 110bbbbb

+            elseif ((ord($str[$i]) & 0xF0) == 0xE0) {
+                            $n = 2;
+            }
+            // 1110bbbb

+            elseif ((ord($str[$i]) & 0xF8) == 0xF0) {
+                            $n = 3;
+            }
+            // 11110bbb

+            elseif ((ord($str[$i]) & 0xFC) == 0xF8) {
+                            $n = 4;
+            }
+            // 111110bb

+            elseif ((ord($str[$i]) & 0xFE) == 0xFC) {
+                            $n = 5;
+            }
+            // 1111110b

+            else {
+                            return false;
+            }
+            // Does not match any model

             for ($j = 0; $j < $n; $j++) { // n bytes matching 10bbbbbb follow ?

-                if (( ++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80))

-                    return false;

+                if (( ++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80)) {
+                                    return false;
+                }
             }

         }

         return true;

@@ -6557,15 +6902,21 @@ 
        // global Globals::$conf;

 

         $tmp = ini_get("unicode.filesystem_encoding");      // Disponible avec PHP 6.0

-        if (empty($tmp) && !empty($_SERVER["WINDIR"]))

-            $tmp = 'iso-8859-1'; // By default for windows

-        if (empty($tmp))

-            $tmp = 'utf-8';          // By default for other

-        if (!empty(Globals::$conf->global->MAIN_FILESYSTEM_ENCODING))

-            $tmp = Globals::$conf->global->MAIN_FILESYSTEM_ENCODING;

-

-        if ($tmp == 'iso-8859-1')

-            return utf8_decode($str);

+        if (empty($tmp) && !empty($_SERVER["WINDIR"])) {
+                    $tmp = 'iso-8859-1';
+        }
+        // By default for windows

+        if (empty($tmp)) {
+                    $tmp = 'utf-8';
+        }
+        // By default for other

+        if (!empty(Globals::$conf->global->MAIN_FILESYSTEM_ENCODING)) {
+                    $tmp = Globals::$conf->global->MAIN_FILESYSTEM_ENCODING;
+        }
+

+        if ($tmp == 'iso-8859-1') {
+                    return utf8_decode($str);
+        }
         return $str;

     }

 

@@ -6586,8 +6937,9 @@ 
     {

        // global $cache_codes;

 // If key empty

-        if ($key == '')

-            return '';

+        if ($key == '') {
+                    return '';
+        }
 

 // Check in cache

         if (isset($cache_codes[$tablename][$key][$fieldid])) { // Can be defined to 0 or ''

@@ -6599,20 +6951,21 @@ 
         $sql = "SELECT " . $fieldid . " as valuetoget";

         $sql .= " FROM " . MAIN_DB_PREFIX . $tablename;

         $sql .= " WHERE " . $fieldkey . " = '" . $db->escape($key) . "'";

-        if (!empty($entityfilter))

-            $sql .= " AND entity IN (" . getEntity($tablename) . ")";

+        if (!empty($entityfilter)) {
+                    $sql .= " AND entity IN (" . getEntity($tablename) . ")";
+        }
 

         $resql = $db->query($sql);

         if ($resql) {

             $obj = $db->fetch_object($resql);

-            if ($obj)

-                $cache_codes[$tablename][$key][$fieldid] = $obj->valuetoget;

-            else

-                $cache_codes[$tablename][$key][$fieldid] = '';

+            if ($obj) {
+                            $cache_codes[$tablename][$key][$fieldid] = $obj->valuetoget;
+            } else {
+                            $cache_codes[$tablename][$key][$fieldid] = '';
+            }
             $db->free($resql);

             return $cache_codes[$tablename][$key][$fieldid];

-        }

-        else {

+        } else {

             return -1;

         }

     }

@@ -6658,16 +7011,17 @@ 
         // global $soc;       // For backward compatibility

 //print $s."<br>\n";

         if ($returnvalue) {

-            if ($hideerrors)

-                return @eval('return ' . $s . ';');

-            else

-                return eval('return ' . $s . ';');

-        }

-        else {

-            if ($hideerrors)

-                @eval($s);

-            else

-                eval($s);

+            if ($hideerrors) {
+                            return @eval('return ' . $s . ';');
+            } else {
+                            return eval('return ' . $s . ';');
+            }
+        } else {

+            if ($hideerrors) {
+                            @eval($s);
+            } else {
+                            eval($s);
+            }
         }

     }

 

@@ -6693,8 +7047,9 @@ 
     {

        // global $langs;

 

-        if (empty($codelang))

-            return '';

+        if (empty($codelang)) {
+                    return '';
+        }
 

         if ($codelang == 'auto') {

             return '<span class="fa fa-globe"></span>';

@@ -6708,9 +7063,9 @@ 
             'sv_SV' => 'se'

         );

 

-        if (isset($langtocountryflag[$codelang]))

-            $flagImage = $langtocountryflag[$codelang];

-        else {

+        if (isset($langtocountryflag[$codelang])) {
+                    $flagImage = $langtocountryflag[$codelang];
+        } else {

             $tmparray = explode('_', $codelang);

             $flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];

         }

@@ -6728,15 +7083,20 @@ 
     {

        // global $mysoc;

 

-        if (strtoupper($countrycode) == 'MQ')

-            return 'fr_CA';

-        if (strtoupper($countrycode) == 'SE')

-            return 'sv_SE'; // se_SE is Sami/Sweden, and we want in priority sv_SE for SE country

+        if (strtoupper($countrycode) == 'MQ') {
+                    return 'fr_CA';
+        }
+        if (strtoupper($countrycode) == 'SE') {
+                    return 'sv_SE';
+        }
+        // se_SE is Sami/Sweden, and we want in priority sv_SE for SE country

         if (strtoupper($countrycode) == 'CH') {

-            if ($mysoc->country_code == 'FR')

-                return 'fr_CH';

-            if ($mysoc->country_code == 'DE')

-                return 'de_CH';

+            if ($mysoc->country_code == 'FR') {
+                            return 'fr_CH';
+            }
+            if ($mysoc->country_code == 'DE') {
+                            return 'de_CH';
+            }
         }

 

 // Locale list taken from:

@@ -6914,8 +7274,9 @@ 
         );

 

         $buildprimarykeytotest = strtolower($countrycode) . '-' . strtoupper($countrycode);

-        if (in_array($buildprimarykeytotest, $locales))

-            return strtolower($countrycode) . '_' . strtoupper($countrycode);

+        if (in_array($buildprimarykeytotest, $locales)) {
+                    return strtolower($countrycode) . '_' . strtoupper($countrycode);
+        }
 

         foreach ($locales as $locale) {

             $locale_language = locale_get_primary_language($locale);

@@ -6969,18 +7330,21 @@ 
 

                 if ($mode == 'add' && !preg_match('/^\-/', $values[1])) {

                     if (count($values) == 6) {       // new declaration with permissions:  $value='objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__'

-                        if ($values[0] != $type)

-                            continue;

+                        if ($values[0] != $type) {
+                                                    continue;
+                        }
 

                         if (verifCond($values[4])) {

-                            if ($values[3])

-                                $langs->load($values[3]);

+                            if ($values[3]) {
+                                                            $langs->load($values[3]);
+                            }
                             if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg)) {

                                 $substitutionarray = array();

                                 complete_substitutions_array($substitutionarray, $langs, $object, array('needforkey' => $values[2]));

                                 $label = make_substitutions($reg[1], $substitutionarray);

-                            } else

-                                $label = $langs->trans($values[2]);

+                            } else {
+                                                            $label = $langs->trans($values[2]);
+                            }
 

                             //$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]), 1);

                             $head[$h][0] = BASE_URI . preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]);

@@ -6988,30 +7352,32 @@ 
                             $head[$h][2] = str_replace('+', '', $values[1]);

                             $h++;

                         }

-                    }

-                    else if (count($values) == 5) {       // deprecated

+                    } else if (count($values) == 5) {       // deprecated

                         dol_syslog('Passing 5 values in tabs module_parts is deprecated. Please update to 6 with permissions.', LOG_WARNING);

 

-                        if ($values[0] != $type)

-                            continue;

-                        if ($values[3])

-                            $langs->load($values[3]);

+                        if ($values[0] != $type) {
+                                                    continue;
+                        }
+                        if ($values[3]) {
+                                                    $langs->load($values[3]);
+                        }
                         if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg)) {

                             $substitutionarray = array();

                             complete_substitutions_array($substitutionarray, $langs, $object, array('needforkey' => $values[2]));

                             $label = make_substitutions($reg[1], $substitutionarray);

-                        } else

-                            $label = $langs->trans($values[2]);

+                        } else {
+                                                    $label = $langs->trans($values[2]);
+                        }
 

                         $head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[4]), 1);

                         $head[$h][1] = $label;

                         $head[$h][2] = str_replace('+', '', $values[1]);

                         $h++;

                     }

-                }

-                else if ($mode == 'remove' && preg_match('/^\-/', $values[1])) {

-                    if ($values[0] != $type)

-                        continue;

+                } else if ($mode == 'remove' && preg_match('/^\-/', $values[1])) {

+                    if ($values[0] != $type) {
+                                            continue;
+                    }
                     $tabname = str_replace('-', '', $values[1]);

                     foreach ($head as $key => $val) {

                         $condition = (!empty($values[3]) ? verifCond($values[3]) : 1);

@@ -7053,10 +7419,11 @@ 
         // global $action;

         // global $micro_start_time;

 

-        if ($zone == 'private')

-            print "\n" . '<!-- Common footer for private page -->' . "\n";

-        else

-            print "\n" . '<!-- Common footer for public page -->' . "\n";

+        if ($zone == 'private') {
+                    print "\n" . '<!-- Common footer for private page -->' . "\n";
+        } else {
+                    print "\n" . '<!-- Common footer for public page -->' . "\n";
+        }
 

 // A div to store page_y POST parameter so we can read it using javascript

         print "\n<!-- A div to store page_y POST paramater -->\n";

@@ -7065,8 +7432,9 @@ 
         $parameters = array();

         $reshook = $hookmanager->executeHooks('printCommonFooter', $parameters);    // Note that $action and $object may have been modified by some hooks

         if (empty($reshook)) {

-            if (!empty(Globals::$conf->global->MAIN_HTML_FOOTER))

-                print Globals::$conf->global->MAIN_HTML_FOOTER . "\n";

+            if (!empty(Globals::$conf->global->MAIN_HTML_FOOTER)) {
+                            print Globals::$conf->global->MAIN_HTML_FOOTER . "\n";
+            }
 

             print "\n";

             if (!empty(Globals::$conf->use_javascript_ajax)) {

@@ -7089,8 +7457,9 @@ 
                     print '/* JS CODE TO ENABLE to manage focus and mandatory form fields */' . "\n";

                     $relativepathstring = $_SERVER["PHP_SELF"];

                     // Clean $relativepathstring

-                    if (constant('DOL_BASE_URI'))

-                        $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);

+                    if (constant('DOL_BASE_URI')) {
+                                            $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+                    }
                     $relativepathstring = preg_replace('/^\//', '', $relativepathstring);

                     $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);

                     $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

@@ -7101,14 +7470,17 @@ 
                                 $tmpqueryarraytohave = explode('&', $defkey);

                                 $foundintru = 0;

                                 foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                    if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                        $foundintru = 1;

+                                    if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                            $foundintru = 1;
+                                    }
                                 }

-                                if (!$foundintru)

-                                    $qualified = 1;

+                                if (!$foundintru) {
+                                                                    $qualified = 1;
+                                }
                                 //var_dump($defkey.'-'.$qualified);

-                            } else

-                                $qualified = 1;

+                            } else {
+                                                            $qualified = 1;
+                            }
 

                             if ($qualified) {

                                 foreach ($defval as $paramkey => $paramval) {

@@ -7127,14 +7499,17 @@ 
                                 $tmpqueryarraytohave = explode('&', $defkey);

                                 $foundintru = 0;

                                 foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                    if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                        $foundintru = 1;

+                                    if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                            $foundintru = 1;
+                                    }
                                 }

-                                if (!$foundintru)

-                                    $qualified = 1;

+                                if (!$foundintru) {
+                                                                    $qualified = 1;
+                                }
                                 //var_dump($defkey.'-'.$qualified);

-                            } else

-                                $qualified = 1;

+                            } else {
+                                                            $qualified = 1;
+                            }
 

                             if ($qualified) {

                                 foreach ($defval as $paramkey => $paramval) {

@@ -7173,8 +7548,9 @@ 
                     print "\n";

                     print "/* JS CODE TO ENABLE to add memory info */\n";

                     print 'window.console && console.log("';

-                    if (!empty(Globals::$conf->global->MEMCACHED_SERVER))

-                        print 'MEMCACHED_SERVER=' . Globals::$conf->global->MEMCACHED_SERVER . ' - ';

+                    if (!empty(Globals::$conf->global->MEMCACHED_SERVER)) {
+                                            print 'MEMCACHED_SERVER=' . Globals::$conf->global->MEMCACHED_SERVER . ' - ';
+                    }
                     print 'MAIN_OPTIMIZE_SPEED=' . (isset(Globals::$conf->global->MAIN_OPTIMIZE_SPEED) ? Globals::$conf->global->MAIN_OPTIMIZE_SPEED : 'off');

                     if (!empty($micro_start_time)) {   // Works only if MAIN_SHOW_TUNING_INFO is defined at $_SERVER level. Not in// global variable.

                         $micro_end_time = microtime(true);

@@ -7304,8 +7680,9 @@ 
 

         $crits = explode(' ', $value);

         $res = '';

-        if (!is_array($fields))

-            $fields = array($fields);

+        if (!is_array($fields)) {
+                    $fields = array($fields);
+        }
 

         $nboffields = count($fields);

         $end2 = count($crits);

@@ -7368,8 +7745,9 @@ 
                     $tmpcrits = explode('|', $crit);

                     $i3 = 0;

                     foreach ($tmpcrits as $tmpcrit) {

-                        if (empty($tmpcrit))

-                            continue;

+                        if (empty($tmpcrit)) {
+                                                    continue;
+                        }
 

                         $newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');

 

@@ -7405,8 +7783,9 @@ 
                 }

                 $i++;

             }

-            if ($newres)

-                $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') . $newres . ($i2 > 1 ? ')' : '');

+            if ($newres) {
+                            $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') . $newres . ($i2 > 1 ? ')' : '');
+            }
             $j++;

         }

         $res = ($nofirstand ? "" : " AND ") . "(" . $res . ")";

@@ -7446,29 +7825,37 @@ 
     static function getImageFileNameForSize($file, $extName, $extImgTarget = '')

     {

         $dirName = dirname($file);

-        if ($dirName == '.')

-            $dirName = '';

+        if ($dirName == '.') {
+                    $dirName = '';
+        }
 

         $fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i', '', $file); // We remove extension, whatever is its case

         $fileName = basename($fileName);

 

-        if (empty($extImgTarget))

-            $extImgTarget = (preg_match('/\.jpg$/i', $file) ? '.jpg' : '');

-        if (empty($extImgTarget))

-            $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '');

-        if (empty($extImgTarget))

-            $extImgTarget = (preg_match('/\.gif$/i', $file) ? '.gif' : '');

-        if (empty($extImgTarget))

-            $extImgTarget = (preg_match('/\.png$/i', $file) ? '.png' : '');

-        if (empty($extImgTarget))

-            $extImgTarget = (preg_match('/\.bmp$/i', $file) ? '.bmp' : '');

-

-        if (!$extImgTarget)

-            return $file;

+        if (empty($extImgTarget)) {
+                    $extImgTarget = (preg_match('/\.jpg$/i', $file) ? '.jpg' : '');
+        }
+        if (empty($extImgTarget)) {
+                    $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '');
+        }
+        if (empty($extImgTarget)) {
+                    $extImgTarget = (preg_match('/\.gif$/i', $file) ? '.gif' : '');
+        }
+        if (empty($extImgTarget)) {
+                    $extImgTarget = (preg_match('/\.png$/i', $file) ? '.png' : '');
+        }
+        if (empty($extImgTarget)) {
+                    $extImgTarget = (preg_match('/\.bmp$/i', $file) ? '.bmp' : '');
+        }
+

+        if (!$extImgTarget) {
+                    return $file;
+        }
 

         $subdir = '';

-        if ($extName)

-            $subdir = 'thumbs/';

+        if ($extName) {
+                    $subdir = 'thumbs/';
+        }
 

         return ($dirName ? $dirName . '/' : '') . $subdir . $fileName . $extName . $extImgTarget; // New filename for thumb

     }

@@ -7486,8 +7873,9 @@ 
     {

        // global Globals::$conf, $langs;

 

-        if (empty(Globals::$conf->use_javascript_ajax))

-            return '';

+        if (empty(Globals::$conf->use_javascript_ajax)) {
+                    return '';
+        }
 

         $mime_preview = array('bmp', 'jpeg', 'png', 'gif', 'tiff', 'pdf', 'plain', 'css', 'svg+xml');

 //$mime_preview[]='vnd.oasis.opendocument.presentation';

@@ -7495,17 +7883,19 @@ 
         $num_mime = array_search(dol_mimetype($relativepath, '', 1), $mime_preview);

 

         if ($alldata == 1) {

-            if ($num_mime !== false)

-                return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : ''), 'mime' => dol_mimetype($relativepath),);

-            else

-                return array();

+            if ($num_mime !== false) {
+                            return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : ''), 'mime' => dol_mimetype($relativepath),);
+            } else {
+                            return array();
+            }
         }

 

 // old behavior

-        if ($num_mime !== false)

-            return 'javascript:document_preview(\'' . dol_escape_js(DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : '')) . '\', \'' . dol_mimetype($relativepath) . '\', \'' . dol_escape_js($langs->trans('Preview')) . '\')';

-        else

-            return '';

+        if ($num_mime !== false) {
+                    return 'javascript:document_preview(\'' . dol_escape_js(DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : '')) . '\', \'' . dol_mimetype($relativepath) . '\', \'' . dol_escape_js($langs->trans('Preview')) . '\')';
+        } else {
+                    return '';
+        }
     }

 

     /**

@@ -7523,8 +7913,9 @@ 
 				    jQuery("#' . $htmlname . '").click(function() { jQuery(this).select(); } );

 				});

 		    </script>';

-        if ($addlink)

-            $out .= ' <a href="' . $addlink . '" target="_blank">' . $langs->trans("Link") . '</a>';

+        if ($addlink) {
+                    $out .= ' <a href="' . $addlink . '" target="_blank">' . $langs->trans("Link") . '</a>';
+        }
         return $out;

     }

 

@@ -7906,8 +8297,9 @@ 
         if (!isset($dictvalues[$tablename])) {

             $dictvalues[$tablename] = array();

             $sql = 'SELECT * FROM ' . $tablename . ' WHERE 1';

-            if ($checkentity)

-                $sql .= ' AND entity IN (0,' . getEntity($tablename) . ')';

+            if ($checkentity) {
+                            $sql .= ' AND entity IN (0,' . getEntity($tablename) . ')';
+            }
 

             $resql = $db->query($sql);

             if ($resql) {

@@ -7919,11 +8311,14 @@ 
             }

         }

 

-        if (!empty($dictvalues[$tablename][$id]))

-            return $dictvalues[$tablename][$id]->{$field}; // Found

+        if (!empty($dictvalues[$tablename][$id])) {
+                    return $dictvalues[$tablename][$id]->{$field};
+        }
+        // Found

         else { // Not found

-            if ($id > 0)

-                return $id;

+            if ($id > 0) {
+                            return $id;
+            }
             return '';

         }

     }

@@ -7953,8 +8348,9 @@ 
                 $b = hexdec($hexb);

             }

             $bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0;    // HSL algorithm

-            if ($bright > 0.6)

-                $res = 1;

+            if ($bright > 0.6) {
+                            $res = 1;
+            }
         }

         return $res;

     }

@@ -7972,8 +8368,10 @@ 
        // global Globals::$conf;

 //print 'type_user='.$type_user.' module='.$menuentry['module'].' enabled='.$menuentry['enabled'].' perms='.$menuentry['perms'];

 //print 'ok='.in_array($menuentry['module'], $listofmodulesforexternal);

-        if (empty($menuentry['enabled']))

-            return 0; // Entry disabled by condition

+        if (empty($menuentry['enabled'])) {
+                    return 0;
+        }
+        // Entry disabled by condition

         if ($type_user && $menuentry['module']) {

             $tmploops = explode('|', $menuentry['module']);

             $found = 0;

@@ -7983,15 +8381,23 @@ 
                     break;

                 }

             }

-            if (!$found)

-                return 0; // Entry is for menus all excluded to external users

-        }

-        if (!$menuentry['perms'] && $type_user)

-            return 0;            // No permissions and user is external

-        if (!$menuentry['perms'] && !empty(Globals::$conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))

-            return 0; // No permissions and option to hide when not allowed, even for internal user, is on

-        if (!$menuentry['perms'])

-            return 2;               // No permissions and user is external

+            if (!$found) {
+                            return 0;
+            }
+            // Entry is for menus all excluded to external users

+        }

+        if (!$menuentry['perms'] && $type_user) {
+                    return 0;
+        }
+        // No permissions and user is external

+        if (!$menuentry['perms'] && !empty(Globals::$conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) {
+                    return 0;
+        }
+        // No permissions and option to hide when not allowed, even for internal user, is on

+        if (!$menuentry['perms']) {
+                    return 2;
+        }
+        // No permissions and user is external

         return 1;

     }

 

Helpers/Globals.php

Spacing +19 added lines, -19 removed lines

@@ -53,7 +53,7 @@ 
         }
 
         if (!defined('DOL_VERSION')) {
-            define('DOL_VERSION', '10.0.0-alpha');  // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+            define('DOL_VERSION', '10.0.0-alpha'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
         }
 
         if (!defined('EURO')) {
@@ -70,7 +70,7 @@ 
     {
         self::$conf = new Conf();
 
-        include DOL_BASE_PATH . '/conf/conf.php';
+        include DOL_BASE_PATH.'/conf/conf.php';
 
         // Set properties specific to database
         Globals::$conf->db->host = $dolibarr_main_db_host;
@@ -98,17 +98,17 @@ 
         Globals::$conf->file->mailing_limit_sendbyweb = $dolibarr_mailing_limit_sendbyweb ?? 0;
         Globals::$conf->file->mailing_limit_sendbycli = $dolibarr_mailing_limit_sendbycli ?? 0;
         Globals::$conf->file->main_authentication = empty($dolibarr_main_authentication) ? '' : $dolibarr_main_authentication; // Identification mode
-        Globals::$conf->file->main_force_https = empty($dolibarr_main_force_https) ? '' : $dolibarr_main_force_https;   // Force https
-        Globals::$conf->file->strict_mode = empty($dolibarr_strict_mode) ? '' : $dolibarr_strict_mode;     // Force php strict mode (for debug)
+        Globals::$conf->file->main_force_https = empty($dolibarr_main_force_https) ? '' : $dolibarr_main_force_https; // Force https
+        Globals::$conf->file->strict_mode = empty($dolibarr_strict_mode) ? '' : $dolibarr_strict_mode; // Force php strict mode (for debug)
         Globals::$conf->file->cookie_cryptkey = empty($dolibarr_main_cookie_cryptkey) ? '' : $dolibarr_main_cookie_cryptkey; // Cookie cryptkey
-        Globals::$conf->file->dol_document_root = array('main' => (string) DOL_DOCUMENT_ROOT);        // Define array of document root directories ('/home/htdocs')
-        Globals::$conf->file->dol_url_root = array('main' => (string) DOL_BASE_URI);         // Define array of url root path ('' or '/dolibarr')
+        Globals::$conf->file->dol_document_root = array('main' => (string) DOL_DOCUMENT_ROOT); // Define array of document root directories ('/home/htdocs')
+        Globals::$conf->file->dol_url_root = array('main' => (string) DOL_BASE_URI); // Define array of url root path ('' or '/dolibarr')
         if (!empty($dolibarr_main_document_root_alt)) {
             // dolibarr_main_document_root_alt can contains several directories
             $values = preg_split('/[;,]/', $dolibarr_main_document_root_alt);
             $i = 0;
             foreach ($values as $value) {
-                Globals::$conf->file->dol_document_root['alt' . ($i++)] = (string) $value;
+                Globals::$conf->file->dol_document_root['alt'.($i++)] = (string) $value;
             }
             $values = preg_split('/[;,]/', $dolibarr_main_url_root_alt);
             $i = 0;
@@ -116,11 +116,11 @@ 
                 if (preg_match('/^http(s)?:/', $value)) {
                     // Show error message
                     $correct_value = str_replace($dolibarr_main_url_root, '', $value);
-                    print '<b>Error:</b><br>' . "\n";
-                    print 'Wrong <b>$dolibarr_main_url_root_alt</b> value in <b>conf.php</b> file.<br>' . "\n";
-                    print 'We now use a relative path to $dolibarr_main_url_root to build alternate URLs.<br>' . "\n";
-                    print 'Value found: ' . $value . '<br>' . "\n";
-                    print 'Should be replaced by: ' . $correct_value . '<br>' . "\n";
+                    print '<b>Error:</b><br>'."\n";
+                    print 'Wrong <b>$dolibarr_main_url_root_alt</b> value in <b>conf.php</b> file.<br>'."\n";
+                    print 'We now use a relative path to $dolibarr_main_url_root to build alternate URLs.<br>'."\n";
+                    print 'Value found: '.$value.'<br>'."\n";
+                    print 'Should be replaced by: '.$correct_value.'<br>'."\n";
                     print "Or something like following examples:<br>\n";
                     print "\"/extensions\"<br>\n";
                     print "\"/extensions1,/extensions2,...\"<br>\n";
@@ -128,7 +128,7 @@ 
                     print "\"/custom\"<br>\n";
                     exit;
                 }
-                Globals::$conf->file->dol_url_root['alt' . ($i++)] = (string) $value;
+                Globals::$conf->file->dol_url_root['alt'.($i++)] = (string) $value;
             }
         }
     }
@@ -162,7 +162,7 @@ 
         if (isset(self::$configFilename)) {
             return self::$configFilename;
         }
-        $filename = CONFIGURATION_PATH . '/config.yaml';
+        $filename = CONFIGURATION_PATH.'/config.yaml';
         if (file_exists($filename) || is_dir(CONFIGURATION_PATH) || mkdir(CONFIGURATION_PATH, 0777, true)) {
             self::$configFilename = $filename;
         }
@@ -227,8 +227,8 @@ 
     {
         self::$global = self::loadConfigurationFile();
         if (isset(self::$global['skin'])) {
-            $templatesFolder = BASE_PATH . Skin::SKINS_FOLDER;
-            $skinFolder = $templatesFolder . '/' . self::$global['skin'];
+            $templatesFolder = BASE_PATH.Skin::SKINS_FOLDER;
+            $skinFolder = $templatesFolder.'/'.self::$global['skin'];
             if (is_dir($templatesFolder) && !is_dir($skinFolder)) {
                 Config::setError("Skin folder '$skinFolder' does not exists!");
                 //(new EditConfig())->run();
@@ -325,13 +325,13 @@ 
     {
         if (self::$dbEngine == null) {
             $dbEngineName = self::$global['dbEngineName'] ?? 'PdoMySql';
-            $helperName = 'Sql' . substr($dbEngineName, 3);
+            $helperName = 'Sql'.substr($dbEngineName, 3);
 
             Debug::addMessage('SQL', "Using '$dbEngineName' engine.");
             Debug::addMessage('SQL', "Using '$helperName' SQL helper engine.");
 
-            $sqlEngine = '\\Alxarafe\\Database\\SqlHelpers\\' . $helperName;
-            $engine = '\\Alxarafe\\Database\\Engines\\' . $dbEngineName;
+            $sqlEngine = '\\Alxarafe\\Database\\SqlHelpers\\'.$helperName;
+            $engine = '\\Alxarafe\\Database\\Engines\\'.$dbEngineName;
             try {
                 Config::$sqlHelper = new $sqlEngine();
                 Config::$dbEngine = new $engine([

Helpers/Security2.php

Spacing +34 added lines, -34 removed lines

@@ -40,7 +40,7 @@ 
     {
         $t = '?';
         if ($mode == 'user')
-            $t = getenv('APACHE_RUN_USER');   // $_ENV['APACHE_RUN_USER'] is empty
+            $t = getenv('APACHE_RUN_USER'); // $_ENV['APACHE_RUN_USER'] is empty
         if ($mode == 'group')
             $t = getenv('APACHE_RUN_GROUP');
         return $t;
@@ -64,7 +64,7 @@ 
             $entitytotest = 1;
         }
 
-        DolUtils::dol_syslog("checkLoginPassEntity usertotest=" . $usertotest . " entitytotest=" . $entitytotest . " authmode=" . join(',', $authmode));
+        DolUtils::dol_syslog("checkLoginPassEntity usertotest=".$usertotest." entitytotest=".$entitytotest." authmode=".join(',', $authmode));
         $login = '';
 
         // Validation of login/pass/entity with standard modules
@@ -74,7 +74,7 @@ 
                 if ($test && $mode && !$login) {
                     // Validation of login/pass/entity for mode $mode
                     $mode = trim($mode);
-                    $authfile = 'functions_' . $mode . '.php';
+                    $authfile = 'functions_'.$mode.'.php';
                     $fullauthfile = '';
 
                     /*
@@ -93,7 +93,7 @@ 
                     $dirlogin = array_merge(array("/Helpers/login"), (array) Globals::$conf->modules_parts['login']);
                     foreach ($dirlogin as $reldir) {
                         // Check if file found (do not use dol_is_file to avoid loading files.lib.php)
-                        $tmpnewauthfile = BASE_PATH . $reldir . '/' . $authfile;
+                        $tmpnewauthfile = BASE_PATH.$reldir.'/'.$authfile;
                         if (is_file($tmpnewauthfile)) {
                             $fullauthfile = $tmpnewauthfile;
                         }
@@ -105,10 +105,10 @@ 
                     }
                     if ($fullauthfile && $result) {
                         // Call function to check user/password
-                        $function = 'check_user_password_' . $mode;
+                        $function = 'check_user_password_'.$mode;
                         $login = \call_user_func($function, $usertotest, $passwordtotest, $entitytotest);
                         if ($login) { // Login is successfull
-                            $test = false;            // To stop once at first login success
+                            $test = false; // To stop once at first login success
                             Globals::$conf->authmode = $mode; // This properties is defined only when logged to say what mode was successfully used
                             $dol_tz = DolUtils::GETPOST('tz');
                             $dol_dst = DolUtils::GETPOST('dst');
@@ -116,7 +116,7 @@ 
                             $dol_screenheight = DolUtils::GETPOST('screenheight');
                         }
                     } else {
-                        DolUtils::dol_syslog("Authentification ko - failed to load file '" . $authfile . "'", LOG_ERR);
+                        DolUtils::dol_syslog("Authentification ko - failed to load file '".$authfile."'", LOG_ERR);
                         sleep(1);
                         // Load translation files required by the page
                         Globals::$langs->loadLangs(array('other', 'main', 'errors'));
@@ -156,7 +156,7 @@ 
 
         // Title
         $appli = constant('DOL_APPLICATION_TITLE');
-        $title = $appli . ' ' . constant('DOL_VERSION');
+        $title = $appli.' '.constant('DOL_VERSION');
         if (!empty(Globals::$conf->global->MAIN_APPLICATION_TITLE)) {
             $title = Globals::$conf->global->MAIN_APPLICATION_TITLE;
         }
@@ -183,19 +183,19 @@ 
         if (!empty(Globals::$conf->modules_parts['tpl'])) { // Using this feature slow down application
             $dirtpls = array_merge(Globals::$conf->modules_parts['tpl'], array('/core/tpl/'));
             foreach ($dirtpls as $reldir) {
-                $tmp = DolUtils::dol_buildpath($reldir . 'login.tpl.php');
+                $tmp = DolUtils::dol_buildpath($reldir.'login.tpl.php');
                 if (file_exists($tmp)) {
                     $template_dir = preg_replace('/login\.tpl\.php$/', '', $tmp);
                     break;
                 }
             }
         } else {
-            $template_dir = DOL_DOCUMENT_ROOT . "/core/tpl/";
+            $template_dir = DOL_DOCUMENT_ROOT."/core/tpl/";
         }
 
 // Set cookie for timeout management
         $prefix = DolUtils::dol_getprefix('');
-        $sessiontimeout = 'DOLSESSTIMEOUT_' . $prefix;
+        $sessiontimeout = 'DOLSESSTIMEOUT_'.$prefix;
         if (!empty(Globals::$conf->global->MAIN_SESSION_TIMEOUT)) {
             setcookie($sessiontimeout, Globals::$conf->global->MAIN_SESSION_TIMEOUT, 0, "/", null, false, true);
         }
@@ -222,7 +222,7 @@ 
 
 // Execute hook getLoginPageOptions (for table)
         $parameters = array('entity' => DolUtils::GETPOST('entity', 'int'));
-        $reshook = Globals::$hookManager->executeHooks('getLoginPageOptions', $parameters);    // Note that $action and $object may have been modified by some hooks.
+        $reshook = Globals::$hookManager->executeHooks('getLoginPageOptions', $parameters); // Note that $action and $object may have been modified by some hooks.
         if (is_array(Globals::$hookManager->resArray) && !empty(Globals::$hookManager->resArray)) {
             $morelogincontent = Globals::$hookManager->resArray; // (deprecated) For compatibility
         } else {
@@ -231,7 +231,7 @@ 
 
 // Execute hook getLoginPageExtraOptions (eg for js)
         $parameters = array('entity' => DolUtils::GETPOST('entity', 'int'));
-        $reshook = Globals::$hookManager->executeHooks('getLoginPageExtraOptions', $parameters);    // Note that $action and $object may have been modified by some hooks.
+        $reshook = Globals::$hookManager->executeHooks('getLoginPageExtraOptions', $parameters); // Note that $action and $object may have been modified by some hooks.
         $moreloginextracontent = Globals::$hookManager->resPrint;
 
 // Login
@@ -240,17 +240,17 @@ 
 
 // Show logo (search in order: small company logo, large company logo, theme logo, common logo)
         $width = 0;
-        $urllogo = DOL_BASE_URI . '/theme/login_logo.png';
+        $urllogo = DOL_BASE_URI.'/theme/login_logo.png';
 
-        if (!empty($mysoc->logo_small) && is_readable(Globals::$conf->mycompany->dir_output . '/logos/thumbs/' . $mysoc->logo_small)) {
-            $urllogo = DOL_BASE_URI . '/viewimage.php?cache=1&modulepart=mycompany&file=' . urlencode('logos/thumbs/' . $mysoc->logo_small);
-        } elseif (!empty($mysoc->logo) && is_readable(Globals::$conf->mycompany->dir_output . '/logos/' . $mysoc->logo)) {
-            $urllogo = DOL_BASE_URI . '/viewimage.php?cache=1&modulepart=mycompany&file=' . urlencode('logos/' . $mysoc->logo);
+        if (!empty($mysoc->logo_small) && is_readable(Globals::$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
+            $urllogo = DOL_BASE_URI.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
+        } elseif (!empty($mysoc->logo) && is_readable(Globals::$conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
+            $urllogo = DOL_BASE_URI.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/'.$mysoc->logo);
             $width = 128;
-        } elseif (is_readable(DOL_BASE_URI . '/theme/' . Globals::$conf->theme . '/img/dolibarr_logo.png')) {
-            $urllogo = DOL_BASE_URI . '/theme/' . Globals::$conf->theme . '/img/dolibarr_logo.png';
-        } elseif (is_readable(DOL_BASE_URI . '/theme/dolibarr_logo.png')) {
-            $urllogo = DOL_BASE_URI . '/theme/dolibarr_logo.png';
+        } elseif (is_readable(DOL_BASE_URI.'/theme/'.Globals::$conf->theme.'/img/dolibarr_logo.png')) {
+            $urllogo = DOL_BASE_URI.'/theme/'.Globals::$conf->theme.'/img/dolibarr_logo.png';
+        } elseif (is_readable(DOL_BASE_URI.'/theme/dolibarr_logo.png')) {
+            $urllogo = DOL_BASE_URI.'/theme/dolibarr_logo.png';
         }
 
 // Security graphical code
@@ -289,7 +289,7 @@ 
 
 // Set jquery theme
         $dol_loginmesg = (!empty($_SESSION["dol_loginmesg"]) ? $_SESSION["dol_loginmesg"] : '');
-        $favicon = DolUtils::dol_buildpath('/theme/' . Globals::$conf->theme . '/img/favicon.ico', 1);
+        $favicon = DolUtils::dol_buildpath('/theme/'.Globals::$conf->theme.'/img/favicon.ico', 1);
         if (!empty(Globals::$conf->global->MAIN_FAVICON_URL)) {
             $favicon = Globals::$conf->global->MAIN_FAVICON_URL;
         }
@@ -322,7 +322,7 @@ 
      */
     function makesalt($type = CRYPT_SALT_LENGTH)
     {
-        DolUtils::dol_syslog("makesalt type=" . $type);
+        DolUtils::dol_syslog("makesalt type=".$type);
         switch ($type) {
             case 12: // 8 + 4
                 $saltlen = 8;
@@ -345,8 +345,8 @@ 
         while (dol_strlen($salt) < $saltlen)
             $salt .= chr(mt_rand(64, 126));
 
-        $result = $saltprefix . $salt . $saltsuffix;
-        DolUtils::dol_syslog("makesalt return=" . $result);
+        $result = $saltprefix.$salt.$saltsuffix;
+        DolUtils::dol_syslog("makesalt return=".$result);
         return $result;
     }
 
@@ -358,12 +358,12 @@ 
      */
     function encodedecode_dbpassconf($level = 0)
     {
-        DolUtils::dol_syslog("encodedecode_dbpassconf level=" . $level, LOG_DEBUG);
+        DolUtils::dol_syslog("encodedecode_dbpassconf level=".$level, LOG_DEBUG);
         Globals::$config = '';
         $passwd = '';
         $passwd_crypted = '';
 
-        if ($fp = fopen(DOL_DOCUMENT_ROOT . '/conf/conf.php', 'r')) {
+        if ($fp = fopen(DOL_DOCUMENT_ROOT.'/conf/conf.php', 'r')) {
             while (!feof($fp)) {
                 $buffer = fgets($fp, 4096);
 
@@ -400,10 +400,10 @@ 
                 if ($lineofpass) {
 // Add value at end of file
                     if ($level == 0) {
-                        Globals::$config .= '$dolibarr_main_db_pass=\'' . $passwd . '\';' . "\n";
+                        Globals::$config .= '$dolibarr_main_db_pass=\''.$passwd.'\';'."\n";
                     }
                     if ($level == 1) {
-                        Globals::$config .= '$dolibarr_main_db_pass=\'crypted:' . $passwd_crypted . '\';' . "\n";
+                        Globals::$config .= '$dolibarr_main_db_pass=\'crypted:'.$passwd_crypted.'\';'."\n";
                     }
 
 //print 'passwd = '.$passwd.' - passwd_crypted = '.$passwd_crypted;
@@ -415,7 +415,7 @@ 
             fclose($fp);
 
 // Write new conf file
-            $file = DOL_DOCUMENT_ROOT . '/conf/conf.php';
+            $file = DOL_DOCUMENT_ROOT.'/conf/conf.php';
             if ($fp = @fopen($file, 'w')) {
                 fputs($fp, Globals::$config);
                 fflush($fp);
@@ -491,10 +491,10 @@ 
                 $generated_password = str_shuffle($randomCode);
             }
         } else if (!empty(Globals::$conf->global->USER_PASSWORD_GENERATED)) {
-            $nomclass = "modGeneratePass" . ucfirst(Globals::$conf->global->USER_PASSWORD_GENERATED);
-            $nomfichier = $nomclass . ".class.php";
+            $nomclass = "modGeneratePass".ucfirst(Globals::$conf->global->USER_PASSWORD_GENERATED);
+            $nomfichier = $nomclass.".class.php";
 //print DOL_DOCUMENT_ROOT."/core/modules/security/generate/".$nomclass;
-            require_once DOL_DOCUMENT_ROOT . "/core/modules/security/generate/" . $nomfichier;
+            require_once DOL_DOCUMENT_ROOT."/core/modules/security/generate/".$nomfichier;
             $genhandler = new $nomclass($db, Globals::$conf, Globals::$langs, $user);
             $generated_password = $genhandler->getNewGeneratedPassword();
             unset($genhandler);

Braces +10 added lines, -6 removed lines

@@ -39,10 +39,13 @@ 
     function dol_getwebuser($mode)
     {
         $t = '?';
-        if ($mode == 'user')
-            $t = getenv('APACHE_RUN_USER');   // $_ENV['APACHE_RUN_USER'] is empty
-        if ($mode == 'group')
-            $t = getenv('APACHE_RUN_GROUP');
+        if ($mode == 'user') {
+                    $t = getenv('APACHE_RUN_USER');
+        }
+        // $_ENV['APACHE_RUN_USER'] is empty
+        if ($mode == 'group') {
+                    $t = getenv('APACHE_RUN_GROUP');
+        }
         return $t;
     }
 
@@ -342,8 +345,9 @@ 
                 break;
         }
         $salt = '';
-        while (dol_strlen($salt) < $saltlen)
-            $salt .= chr(mt_rand(64, 126));
+        while (dol_strlen($salt) < $saltlen) {
+                    $salt .= chr(mt_rand(64, 126));
+        }
 
         $result = $saltprefix . $salt . $saltsuffix;
         DolUtils::dol_syslog("makesalt return=" . $result);

Helpers/Security.php

Spacing +66 added lines, -66 removed lines

@@ -110,7 +110,7 @@ 
         }

         // Salt value

         if (!empty(Globals::$conf->global->MAIN_SECURITY_SALT)) {

-            $chain = Globals::$conf->global->MAIN_SECURITY_SALT . $chain;

+            $chain = Globals::$conf->global->MAIN_SECURITY_SALT.$chain;

         }

         if ($type == '1' || $type == 'sha1') {

             return sha1($chain);

@@ -122,7 +122,7 @@ 
             return md5($chain);

         }

         if ($type == '4' || $type == 'md5openldap') {

-            return '{md5}' . base64_encode(mhash(MHASH_MD5, $chain)); // For OpenLdap with md5 (based on an unencrypted password in base)

+            return '{md5}'.base64_encode(mhash(MHASH_MD5, $chain)); // For OpenLdap with md5 (based on an unencrypted password in base)

         }

         if ($type == '5') {

             return hash('sha256', $chain);

@@ -202,7 +202,7 @@ 
             return false;

 

         if ($dbt_select != 'rowid' && $dbt_select != 'id')

-            $objectid = "'" . $objectid . "'";

+            $objectid = "'".$objectid."'";

 

         // Features/modules to check

         $featuresarray = array($features);

@@ -402,7 +402,7 @@ 
                 else if ($feature == 'ftp') {

                     if (!$user->rights->ftp->write)

                         $deleteok = 0;

-                }else if ($feature == 'salaries') {

+                } else if ($feature == 'salaries') {

                     if (!$user->rights->salaries->delete)

                         $deleteok = 0;

                 }

@@ -480,8 +480,8 @@ 
                 $feature = 'projet_task';

 

             $check = array('adherent', 'banque', 'don', 'user', 'usergroup', 'product', 'produit', 'service', 'produit|service', 'categorie', 'resource'); // Test on entity only (Objects with no link to company)

-            $checksoc = array('societe');  // Test for societe object

-            $checkother = array('contact', 'agenda');  // Test on entity and link to third party. Allowed if link is empty (Ex: contacts...).

+            $checksoc = array('societe'); // Test for societe object

+            $checkother = array('contact', 'agenda'); // Test on entity and link to third party. Allowed if link is empty (Ex: contacts...).

             $checkproject = array('projet', 'project'); // Test for project object

             $checktask = array('projet_task');

             $nocheck = array('barcode', 'stock'); // No test

@@ -489,32 +489,32 @@ 
             // If dbtablename not defined, we use same name for table than module name

             if (empty($dbtablename)) {

                 $dbtablename = $feature;

-                $sharedelement = (!empty($params[1]) ? $params[1] : $dbtablename);  // We change dbtablename, so we set sharedelement too.

+                $sharedelement = (!empty($params[1]) ? $params[1] : $dbtablename); // We change dbtablename, so we set sharedelement too.

             }

 

             // Check permission for object with entity

             if (in_array($feature, $check)) {

-                $sql = "SELECT COUNT(dbt." . $dbt_select . ") as nb";

-                $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";

+                $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";

+                $sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";

                 if (($feature == 'user' || $feature == 'usergroup') && !empty($conf->multicompany->enabled)) {

                     if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

                         if ($conf->entity == 1 && $user->admin && !$user->entity) {

-                            $sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";

+                            $sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

                             $sql .= " AND dbt.entity IS NOT NULL";

                         } else {

-                            $sql .= "," . MAIN_DB_PREFIX . "usergroup_user as ug";

-                            $sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";

+                            $sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";

+                            $sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

                             $sql .= " AND (ug.fk_user = dbt.rowid";

-                            $sql .= " AND ug.entity IN (" . getEntity('user') . "))";

+                            $sql .= " AND ug.entity IN (".getEntity('user')."))";

                             $sql .= " OR dbt.entity = 0"; // Show always superadmin

                         }

                     } else {

-                        $sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";

-                        $sql .= " AND dbt.entity IN (" . getEntity($sharedelement, 1) . ")";

+                        $sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

+                        $sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";

                     }

                 } else {

-                    $sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";

-                    $sql .= " AND dbt.entity IN (" . getEntity($sharedelement, 1) . ")";

+                    $sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

+                    $sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";

                 }

             } else if (in_array($feature, $checksoc)) { // We check feature = checksoc

                 // If external user: Check permission for external users

@@ -525,47 +525,47 @@ 
                 // If internal user: Check permission for internal users that are restricted on their objects

                 else if (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir)) {

                     $sql = "SELECT COUNT(sc.fk_soc) as nb";

-                    $sql .= " FROM (" . MAIN_DB_PREFIX . "societe_commerciaux as sc";

-                    $sql .= ", " . MAIN_DB_PREFIX . "societe as s)";

-                    $sql .= " WHERE sc.fk_soc IN (" . $objectid . ")";

-                    $sql .= " AND sc.fk_user = " . $user->id;

+                    $sql .= " FROM (".MAIN_DB_PREFIX."societe_commerciaux as sc";

+                    $sql .= ", ".MAIN_DB_PREFIX."societe as s)";

+                    $sql .= " WHERE sc.fk_soc IN (".$objectid.")";

+                    $sql .= " AND sc.fk_user = ".$user->id;

                     $sql .= " AND sc.fk_soc = s.rowid";

-                    $sql .= " AND s.entity IN (" . getEntity($sharedelement, 1) . ")";

+                    $sql .= " AND s.entity IN (".getEntity($sharedelement, 1).")";

                 }

                 // If multicompany and internal users with all permissions, check user is in correct entity

                 else if (!empty($conf->multicompany->enabled)) {

                     $sql = "SELECT COUNT(s.rowid) as nb";

-                    $sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";

-                    $sql .= " WHERE s.rowid IN (" . $objectid . ")";

-                    $sql .= " AND s.entity IN (" . getEntity($sharedelement, 1) . ")";

+                    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";

+                    $sql .= " WHERE s.rowid IN (".$objectid.")";

+                    $sql .= " AND s.entity IN (".getEntity($sharedelement, 1).")";

                 }

             } else if (in_array($feature, $checkother)) { // Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).

                 // If external user: Check permission for external users

                 if ($user->socid > 0) {

-                    $sql = "SELECT COUNT(dbt." . $dbt_select . ") as nb";

-                    $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";

-                    $sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";

-                    $sql .= " AND dbt.fk_soc = " . $user->socid;

+                    $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";

+                    $sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";

+                    $sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

+                    $sql .= " AND dbt.fk_soc = ".$user->socid;

                 }

                 // If internal user: Check permission for internal users that are restricted on their objects

                 else if (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir)) {

-                    $sql = "SELECT COUNT(dbt." . $dbt_select . ") as nb";

-                    $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";

-                    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON dbt.fk_soc = sc.fk_soc AND sc.fk_user = '" . $user->id . "'";

-                    $sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";

+                    $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";

+                    $sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";

+                    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON dbt.fk_soc = sc.fk_soc AND sc.fk_user = '".$user->id."'";

+                    $sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

                     $sql .= " AND (dbt.fk_soc IS NULL OR sc.fk_soc IS NOT NULL)"; // Contact not linked to a company or to a company of user

-                    $sql .= " AND dbt.entity IN (" . getEntity($sharedelement, 1) . ")";

+                    $sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";

                 }

                 // If multicompany and internal users with all permissions, check user is in correct entity

                 else if (!empty($conf->multicompany->enabled)) {

-                    $sql = "SELECT COUNT(dbt." . $dbt_select . ") as nb";

-                    $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";

-                    $sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";

-                    $sql .= " AND dbt.entity IN (" . getEntity($sharedelement, 1) . ")";

+                    $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";

+                    $sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";

+                    $sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

+                    $sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";

                 }

             } else if (in_array($feature, $checkproject)) {

                 if (!empty($conf->projet->enabled) && empty($user->rights->projet->all->lire)) {

-                    include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';

+                    include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';

                     $projectstatic = new Project($db);

                     $tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);

                     $tmparray = explode(',', $tmps);

@@ -573,17 +573,17 @@ 
                         return false;

                 }

                 else {

-                    $sql = "SELECT COUNT(dbt." . $dbt_select . ") as nb";

-                    $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";

-                    $sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";

-                    $sql .= " AND dbt.entity IN (" . getEntity($sharedelement, 1) . ")";

+                    $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";

+                    $sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";

+                    $sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

+                    $sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";

                 }

             } else if (in_array($feature, $checktask)) {

                 if (!empty($conf->projet->enabled) && empty($user->rights->projet->all->lire)) {

                     $task = new Task($db);

                     $task->fetch($objectid);

 

-                    include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';

+                    include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';

                     $projectstatic = new Project($db);

                     $tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);

                     $tmparray = explode(',', $tmps);

@@ -591,41 +591,41 @@ 
                         return false;

                 }

                 else {

-                    $sql = "SELECT COUNT(dbt." . $dbt_select . ") as nb";

-                    $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";

-                    $sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";

-                    $sql .= " AND dbt.entity IN (" . getEntity($sharedelement, 1) . ")";

+                    $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";

+                    $sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";

+                    $sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

+                    $sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";

                 }

             } else if (!in_array($feature, $nocheck)) {  // By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield

                 // If external user: Check permission for external users

                 if ($user->socid > 0) {

                     if (empty($dbt_keyfield))

                         dol_print_error('', 'Param dbt_keyfield is required but not defined');

-                    $sql = "SELECT COUNT(dbt." . $dbt_keyfield . ") as nb";

-                    $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";

-                    $sql .= " WHERE dbt.rowid IN (" . $objectid . ")";

-                    $sql .= " AND dbt." . $dbt_keyfield . " = " . $user->socid;

+                    $sql = "SELECT COUNT(dbt.".$dbt_keyfield.") as nb";

+                    $sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";

+                    $sql .= " WHERE dbt.rowid IN (".$objectid.")";

+                    $sql .= " AND dbt.".$dbt_keyfield." = ".$user->socid;

                 }

                 // If internal user: Check permission for internal users that are restricted on their objects

                 else if (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir)) {

                     if (empty($dbt_keyfield))

                         dol_print_error('', 'Param dbt_keyfield is required but not defined');

                     $sql = "SELECT COUNT(sc.fk_soc) as nb";

-                    $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";

-                    $sql .= ", " . MAIN_DB_PREFIX . "societe as s";

-                    $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";

-                    $sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";

-                    $sql .= " AND sc.fk_soc = dbt." . $dbt_keyfield;

-                    $sql .= " AND dbt." . $dbt_keyfield . " = s.rowid";

-                    $sql .= " AND dbt.entity IN (" . getEntity($sharedelement, 1) . ")";

-                    $sql .= " AND sc.fk_user = " . $user->id;

+                    $sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";

+                    $sql .= ", ".MAIN_DB_PREFIX."societe as s";

+                    $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

+                    $sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

+                    $sql .= " AND sc.fk_soc = dbt.".$dbt_keyfield;

+                    $sql .= " AND dbt.".$dbt_keyfield." = s.rowid";

+                    $sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";

+                    $sql .= " AND sc.fk_user = ".$user->id;

                 }

                 // If multicompany and internal users with all permissions, check user is in correct entity

                 else if (!empty($conf->multicompany->enabled)) {

-                    $sql = "SELECT COUNT(dbt." . $dbt_select . ") as nb";

-                    $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";

-                    $sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";

-                    $sql .= " AND dbt.entity IN (" . getEntity($sharedelement, 1) . ")";

+                    $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";

+                    $sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";

+                    $sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

+                    $sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";

                 }

             }

 

@@ -658,7 +658,7 @@ 
     {

         global $conf, $db, $user, $langs;

         if (!is_object($langs)) {

-            include_once DOL_DOCUMENT_ROOT . '/core/class/translate.class.php';

+            include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';

             $langs = new Translate('', $conf);

             $langs->setDefaultLang();

         }

@@ -680,7 +680,7 @@ 
         print '<br>';

         if (empty($showonlymessage)) {

             if ($user->login) {

-                print $langs->trans("CurrentLogin") . ': <font class="error">' . $user->login . '</font><br>';

+                print $langs->trans("CurrentLogin").': <font class="error">'.$user->login.'</font><br>';

                 print $langs->trans("ErrorForbidden2", $langs->trans("Home"), $langs->trans("Users"));

             } else {

                 print $langs->trans("ErrorForbidden3");

Braces +129 added lines, -104 removed lines

@@ -196,24 +196,29 @@ 
         // Get more permissions checks from hooks

         $parameters = array('features' => $features, 'objectid' => $objectid, 'idtype' => $dbt_select);

         $reshook = $hookmanager->executeHooks('restrictedArea', $parameters);

-        if (!empty($hookmanager->resArray['result']))

-            return true;

-        if ($reshook > 0)

-            return false;

+        if (!empty($hookmanager->resArray['result'])) {
+                    return true;
+        }
+        if ($reshook > 0) {
+                    return false;
+        }
 

-        if ($dbt_select != 'rowid' && $dbt_select != 'id')

-            $objectid = "'" . $objectid . "'";

+        if ($dbt_select != 'rowid' && $dbt_select != 'id') {
+                    $objectid = "'" . $objectid . "'";
+        }
 

         // Features/modules to check

         $featuresarray = array($features);

-        if (preg_match('/&/', $features))

-            $featuresarray = explode("&", $features);

-        else if (preg_match('/\|/', $features))

-            $featuresarray = explode("|", $features);

+        if (preg_match('/&/', $features)) {
+                    $featuresarray = explode("&", $features);
+        } else if (preg_match('/\|/', $features)) {
+                    $featuresarray = explode("|", $features);
+        }
 

         // More subfeatures to check

-        if (!empty($feature2))

-            $feature2 = explode("|", $feature2);

+        if (!empty($feature2)) {
+                    $feature2 = explode("|", $feature2);
+        }
 

         // More parameters

         $params = explode('&', $tableandshare);

@@ -227,8 +232,9 @@ 
         $nbko = 0;

         foreach ($featuresarray as $feature) { // first we check nb of test ko

             $featureforlistofmodule = $feature;

-            if ($featureforlistofmodule == 'produit')

-                $featureforlistofmodule = 'product';

+            if ($featureforlistofmodule == 'produit') {
+                            $featureforlistofmodule = 'product';
+            }
             if (!empty($user->societe_id) && !empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && !in_array($featureforlistofmodule, $listofmodules)) { // If limits on modules for external users, module must be into list of modules for external users

                 $readok = 0;

                 $nbko++;

@@ -290,11 +296,13 @@ 
         }

 

         // If a or and at least one ok

-        if (preg_match('/\|/', $features) && $nbko < count($featuresarray))

-            $readok = 1;

+        if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) {
+                    $readok = 1;
+        }
 

-        if (!$readok)

-            accessforbidden();

+        if (!$readok) {
+                    accessforbidden();
+        }
         //print "Read access is ok";

         // Check write permission from module (we need to know write permission to create but also to delete drafts record)

         $createok = 1;

@@ -351,22 +359,26 @@ 
             }

 

             // If a or and at least one ok

-            if (preg_match('/\|/', $features) && $nbko < count($featuresarray))

-                $createok = 1;

+            if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) {
+                            $createok = 1;
+            }
 

-            if (GETPOST('action', 'aZ09') == 'create' && !$createok)

-                accessforbidden();

+            if (GETPOST('action', 'aZ09') == 'create' && !$createok) {
+                            accessforbidden();
+            }
             //print "Write access is ok";

         }

 

         // Check create user permission

         $createuserok = 1;

         if (GETPOST('action', 'aZ09') == 'confirm_create_user' && GETPOST("confirm", 'aZ09') == 'yes') {

-            if (!$user->rights->user->user->creer)

-                $createuserok = 0;

+            if (!$user->rights->user->user->creer) {
+                            $createuserok = 0;
+            }
 

-            if (!$createuserok)

-                accessforbidden();

+            if (!$createuserok) {
+                            accessforbidden();
+            }
             //print "Create user access is ok";

         }

 

@@ -376,62 +388,66 @@ 
         if ((GETPOST("action", "aZ09") == 'confirm_delete' && GETPOST("confirm", "aZ09") == 'yes') || GETPOST("action", "aZ09") == 'delete') {

             foreach ($featuresarray as $feature) {

                 if ($feature == 'contact') {

-                    if (!$user->rights->societe->contact->supprimer)

-                        $deleteok = 0;

-                }

-                else if ($feature == 'produit|service') {

-                    if (!$user->rights->produit->supprimer && !$user->rights->service->supprimer)

-                        $deleteok = 0;

-                }

-                else if ($feature == 'commande_fournisseur') {

-                    if (!$user->rights->fournisseur->commande->supprimer)

-                        $deleteok = 0;

-                }

-                else if ($feature == 'banque') {

-                    if (!$user->rights->banque->modifier)

-                        $deleteok = 0;

-                }

-                else if ($feature == 'cheque') {

-                    if (!$user->rights->banque->cheque)

-                        $deleteok = 0;

-                }

-                else if ($feature == 'ecm') {

-                    if (!$user->rights->ecm->upload)

-                        $deleteok = 0;

-                }

-                else if ($feature == 'ftp') {

-                    if (!$user->rights->ftp->write)

-                        $deleteok = 0;

-                }else if ($feature == 'salaries') {

-                    if (!$user->rights->salaries->delete)

-                        $deleteok = 0;

-                }

-                else if ($feature == 'salaries') {

-                    if (!$user->rights->salaries->delete)

-                        $deleteok = 0;

-                }

-                else if (!empty($feature2)) { // This should be used for permissions on 2 levels

+                    if (!$user->rights->societe->contact->supprimer) {
+                                            $deleteok = 0;
+                    }
+                } else if ($feature == 'produit|service') {

+                    if (!$user->rights->produit->supprimer && !$user->rights->service->supprimer) {
+                                            $deleteok = 0;
+                    }
+                } else if ($feature == 'commande_fournisseur') {

+                    if (!$user->rights->fournisseur->commande->supprimer) {
+                                            $deleteok = 0;
+                    }
+                } else if ($feature == 'banque') {

+                    if (!$user->rights->banque->modifier) {
+                                            $deleteok = 0;
+                    }
+                } else if ($feature == 'cheque') {

+                    if (!$user->rights->banque->cheque) {
+                                            $deleteok = 0;
+                    }
+                } else if ($feature == 'ecm') {

+                    if (!$user->rights->ecm->upload) {
+                                            $deleteok = 0;
+                    }
+                } else if ($feature == 'ftp') {

+                    if (!$user->rights->ftp->write) {
+                                            $deleteok = 0;
+                    }
+                } else if ($feature == 'salaries') {

+                    if (!$user->rights->salaries->delete) {
+                                            $deleteok = 0;
+                    }
+                } else if ($feature == 'salaries') {

+                    if (!$user->rights->salaries->delete) {
+                                            $deleteok = 0;
+                    }
+                } else if (!empty($feature2)) { // This should be used for permissions on 2 levels

                     foreach ($feature2 as $subfeature) {

-                        if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete))

-                            $deleteok = 0;

-                        else {

+                        if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete)) {
+                                                    $deleteok = 0;
+                        } else {

                             $deleteok = 1;

                             break;

                         } // For bypass the second test if the first is ok

                     }

                 } else if (!empty($feature)) {  // This is used for permissions on 1 level

                     //print '<br>feature='.$feature.' creer='.$user->rights->$feature->supprimer.' write='.$user->rights->$feature->delete;

-                    if (empty($user->rights->$feature->supprimer) && empty($user->rights->$feature->delete) && empty($user->rights->$feature->run))

-                        $deleteok = 0;

+                    if (empty($user->rights->$feature->supprimer) && empty($user->rights->$feature->delete) && empty($user->rights->$feature->run)) {
+                                            $deleteok = 0;
+                    }
                 }

             }

 

             // If a or and at least one ok

-            if (preg_match('/\|/', $features) && $nbko < count($featuresarray))

-                $deleteok = 1;

+            if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) {
+                            $deleteok = 1;
+            }
 

-            if (!$deleteok && !($isdraft && $createok))

-                accessforbidden();

+            if (!$deleteok && !($isdraft && $createok)) {
+                            accessforbidden();
+            }
             //print "Delete access is ok";

         }

 

@@ -472,12 +488,15 @@ 
             $sql = '';

 

             // For backward compatibility

-            if ($feature == 'member')

-                $feature = 'adherent';

-            if ($feature == 'project')

-                $feature = 'projet';

-            if ($feature == 'task')

-                $feature = 'projet_task';

+            if ($feature == 'member') {
+                            $feature = 'adherent';
+            }
+            if ($feature == 'project') {
+                            $feature = 'projet';
+            }
+            if ($feature == 'task') {
+                            $feature = 'projet_task';
+            }
 

             $check = array('adherent', 'banque', 'don', 'user', 'usergroup', 'product', 'produit', 'service', 'produit|service', 'categorie', 'resource'); // Test on entity only (Objects with no link to company)

             $checksoc = array('societe');  // Test for societe object

@@ -519,8 +538,9 @@ 
             } else if (in_array($feature, $checksoc)) { // We check feature = checksoc

                 // If external user: Check permission for external users

                 if ($user->socid > 0) {

-                    if ($user->socid <> $objectid)

-                        return false;

+                    if ($user->socid <> $objectid) {
+                                            return false;
+                    }
                 }

                 // If internal user: Check permission for internal users that are restricted on their objects

                 else if (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir)) {

@@ -569,10 +589,10 @@ 
                     $projectstatic = new Project($db);

                     $tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);

                     $tmparray = explode(',', $tmps);

-                    if (!in_array($objectid, $tmparray))

-                        return false;

-                }

-                else {

+                    if (!in_array($objectid, $tmparray)) {
+                                            return false;
+                    }
+                } else {

                     $sql = "SELECT COUNT(dbt." . $dbt_select . ") as nb";

                     $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";

                     $sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";

@@ -587,10 +607,10 @@ 
                     $projectstatic = new Project($db);

                     $tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);

                     $tmparray = explode(',', $tmps);

-                    if (!in_array($task->fk_project, $tmparray))

-                        return false;

-                }

-                else {

+                    if (!in_array($task->fk_project, $tmparray)) {
+                                            return false;
+                    }
+                } else {

                     $sql = "SELECT COUNT(dbt." . $dbt_select . ") as nb";

                     $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";

                     $sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";

@@ -599,8 +619,9 @@ 
             } else if (!in_array($feature, $nocheck)) {  // By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield

                 // If external user: Check permission for external users

                 if ($user->socid > 0) {

-                    if (empty($dbt_keyfield))

-                        dol_print_error('', 'Param dbt_keyfield is required but not defined');

+                    if (empty($dbt_keyfield)) {
+                                            dol_print_error('', 'Param dbt_keyfield is required but not defined');
+                    }
                     $sql = "SELECT COUNT(dbt." . $dbt_keyfield . ") as nb";

                     $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";

                     $sql .= " WHERE dbt.rowid IN (" . $objectid . ")";

@@ -608,8 +629,9 @@ 
                 }

                 // If internal user: Check permission for internal users that are restricted on their objects

                 else if (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir)) {

-                    if (empty($dbt_keyfield))

-                        dol_print_error('', 'Param dbt_keyfield is required but not defined');

+                    if (empty($dbt_keyfield)) {
+                                            dol_print_error('', 'Param dbt_keyfield is required but not defined');
+                    }
                     $sql = "SELECT COUNT(sc.fk_soc) as nb";

                     $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";

                     $sql .= ", " . MAIN_DB_PREFIX . "societe as s";

@@ -633,10 +655,10 @@ 
                 $resql = $db->query($sql);

                 if ($resql) {

                     $obj = $db->fetch_object($resql);

-                    if (!$obj || $obj->nb < count(explode(',', $objectid)))

-                        return false;

-                }

-                else {

+                    if (!$obj || $obj->nb < count(explode(',', $objectid))) {
+                                            return false;
+                    }
+                } else {

                     return false;

                 }

             }

@@ -666,16 +688,18 @@ 
         $langs->load("errors");

 

         if ($printheader) {

-            if (function_exists("llxHeader"))

-                llxHeader('');

-            else if (function_exists("llxHeaderVierge"))

-                llxHeaderVierge('');

+            if (function_exists("llxHeader")) {
+                            llxHeader('');
+            } else if (function_exists("llxHeaderVierge")) {
+                            llxHeaderVierge('');
+            }
         }

         print '<div class="error">';

-        if (!$message)

-            print $langs->trans("ErrorForbidden");

-        else

-            print $message;

+        if (!$message) {
+                    print $langs->trans("ErrorForbidden");
+        } else {
+                    print $message;
+        }
         print '</div>';

         print '<br>';

         if (empty($showonlymessage)) {

@@ -686,8 +710,9 @@ 
                 print $langs->trans("ErrorForbidden3");

             }

         }

-        if ($printfooter && function_exists("llxFooter"))

-            llxFooter();

+        if ($printfooter && function_exists("llxFooter")) {
+                    llxFooter();
+        }
         exit(0);

     }

 }

Helpers/DateLib.php

Spacing +22 added lines, -22 removed lines

@@ -89,11 +89,11 @@ 
             $monthref = dol_print_date($gmtnow, '%m');

             $dayref = dol_print_date($gmtnow, '%d');

             if ($refgmtdate == 'now')

-                $newrefgmtdate = $yearref . '-' . $monthref . '-' . $dayref;

+                $newrefgmtdate = $yearref.'-'.$monthref.'-'.$dayref;

             elseif ($refgmtdate == 'summer')

-                $newrefgmtdate = $yearref . '-08-01';

+                $newrefgmtdate = $yearref.'-08-01';

             else

-                $newrefgmtdate = $yearref . '-01-01';

+                $newrefgmtdate = $yearref.'-01-01';

             $newrefgmtdate .= 'T00:00:00+00:00';

             $localtz = new DateTimeZone(getServerTimeZoneString());

             $localdt = new DateTime($newrefgmtdate, $localtz);

@@ -201,9 +201,9 @@ 
         global $langs;

 

         if (empty($lengthOfDay))

-            $lengthOfDay = 86400;         // 1 day = 24 hours

+            $lengthOfDay = 86400; // 1 day = 24 hours

         if (empty($lengthOfWeek))

-            $lengthOfWeek = 7;            // 1 week = 7 days

+            $lengthOfWeek = 7; // 1 week = 7 days

 

         if ($format == 'all' || $format == 'allwithouthour' || $format == 'allhour' || $format == 'allhourmin') {

             if ((int) $iSecond === 0)

@@ -226,12 +226,12 @@ 
             if ($lengthOfWeek < 7) {

                 if ($sDay) {

                     if ($sDay >= $lengthOfWeek) {

-                        $sWeek = (int) (($sDay - $sDay % $lengthOfWeek ) / $lengthOfWeek);

+                        $sWeek = (int) (($sDay - $sDay % $lengthOfWeek) / $lengthOfWeek);

                         $sDay = $sDay % $lengthOfWeek;

                         $weekTranslate = $langs->trans("DurationWeek");

                         if ($sWeek >= 2)

                             $weekTranslate = $langs->trans("DurationWeeks");

-                        $sTime .= $sWeek . ' ' . $weekTranslate . ' ';

+                        $sTime .= $sWeek.' '.$weekTranslate.' ';

                     }

                 }

             }

@@ -239,7 +239,7 @@ 
                 $dayTranslate = $langs->trans("Day");

                 if ($sDay > 1)

                     $dayTranslate = $langs->trans("Days");

-                $sTime .= $sDay . ' ' . $dayTranslate . ' ';

+                $sTime .= $sDay.' '.$dayTranslate.' ';

             }

 

             if ($format == 'all') {

@@ -248,7 +248,7 @@ 
                 }

             }

             if ($format == 'allhourmin') {

-                return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600))) . ':' . sprintf("%02d", ((int) floor(($iSecond % 3600) / 60)));

+                return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60)));

             }

             if ($format == 'allhour') {

                 return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600)));

@@ -289,16 +289,16 @@ 
         $sqldate = "";

         if ($month_date > 0) {

             if ($year_date > 0 && empty($day_date)) {

-                $sqldate .= " AND " . $datefield . " BETWEEN '" . $db->idate(dol_get_first_day($year_date, $month_date, false));

-                $sqldate .= "' AND '" . $db->idate(dol_get_last_day($year_date, $month_date, false)) . "'";

+                $sqldate .= " AND ".$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, $month_date, false));

+                $sqldate .= "' AND '".$db->idate(dol_get_last_day($year_date, $month_date, false))."'";

             } else if ($year_date > 0 && !empty($day_date)) {

-                $sqldate .= " AND " . $datefield . " BETWEEN '" . $db->idate(dol_mktime(0, 0, 0, $month_date, $day_date, $year_date));

-                $sqldate .= "' AND '" . $db->idate(dol_mktime(23, 59, 59, $month_date, $day_date, $year_date)) . "'";

+                $sqldate .= " AND ".$datefield." BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_date, $day_date, $year_date));

+                $sqldate .= "' AND '".$db->idate(dol_mktime(23, 59, 59, $month_date, $day_date, $year_date))."'";

             } else

-                $sqldate .= " AND date_format( " . $datefield . ", '%m') = '" . $db->escape($month_date) . "'";

+                $sqldate .= " AND date_format( ".$datefield.", '%m') = '".$db->escape($month_date)."'";

         } else if ($year_date > 0) {

-            $sqldate .= " AND " . $datefield . " BETWEEN '" . $db->idate(dol_get_first_day($year_date, 1, false));

-            $sqldate .= "' AND '" . $db->idate(dol_get_last_day($year_date, 12, false)) . "'";

+            $sqldate .= " AND ".$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, 1, false));

+            $sqldate .= "' AND '".$db->idate(dol_get_last_day($year_date, 12, false))."'";

         }

         return $sqldate;

     }

@@ -355,7 +355,7 @@ 
         }

 

         $string = preg_replace('/([^0-9])/i', '', $string);

-        $tmp = $string . '000000';

+        $tmp = $string.'000000';

         $date = DolUtils::dol_mktime(substr($tmp, 8, 2), substr($tmp, 10, 2), substr($tmp, 12, 2), substr($tmp, 4, 2), substr($tmp, 6, 2), substr($tmp, 0, 4), ($gm ? 1 : 0));

         return $date;

     }

@@ -594,7 +594,7 @@ 
             return 'ErrorDates must use same hours and must be GMT dates';

 

         $i = 0;

-        while (( ($lastday == 0 && $timestampStart < $timestampEnd) || ($lastday && $timestampStart <= $timestampEnd) ) && ($i < 50000)) {  // Loop end when equals (Test on i is a security loop to avoid infinite loop)

+        while ((($lastday == 0 && $timestampStart < $timestampEnd) || ($lastday && $timestampStart <= $timestampEnd)) && ($i < 50000)) {  // Loop end when equals (Test on i is a security loop to avoid infinite loop)

             $ferie = false;

             $countryfound = 0;

             $includesaturdayandsunday = 1;

@@ -917,7 +917,7 @@ 
         if (empty($country_code))

             $country_code = $mysoc->country_code;

 

-        dol_syslog('num_open_day timestampStart=' . $timestampStart . ' timestampEnd=' . $timestampEnd . ' bit=' . $lastday . ' country_code=' . $country_code);

+        dol_syslog('num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday.' country_code='.$country_code);

 

         // Check parameters

         if (!is_int($timestampStart) && !is_float($timestampStart))

@@ -930,15 +930,15 @@ 
             $numdays = num_between_day($timestampStart, $timestampEnd, $lastday);

             $numholidays = num_public_holiday($timestampStart, $timestampEnd, $country_code, $lastday);

             $nbOpenDay = $numdays - $numholidays;

-            $nbOpenDay .= " " . $langs->trans("Days");

+            $nbOpenDay .= " ".$langs->trans("Days");

             if ($inhour == 1 && $nbOpenDay <= 3)

-                $nbOpenDay = $nbOpenDay * 24 . $langs->trans("HourShort");

+                $nbOpenDay = $nbOpenDay * 24.$langs->trans("HourShort");

             return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));

         }

         elseif ($timestampStart == $timestampEnd) {

             $nbOpenDay = $lastday;

             if ($inhour == 1)

-                $nbOpenDay = $nbOpenDay * 24 . $langs->trans("HourShort");

+                $nbOpenDay = $nbOpenDay * 24.$langs->trans("HourShort");

             return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));

         }

         else {

Braces +310 added lines, -184 removed lines

@@ -88,19 +88,19 @@ 
             $yearref = dol_print_date($gmtnow, '%Y');

             $monthref = dol_print_date($gmtnow, '%m');

             $dayref = dol_print_date($gmtnow, '%d');

-            if ($refgmtdate == 'now')

-                $newrefgmtdate = $yearref . '-' . $monthref . '-' . $dayref;

-            elseif ($refgmtdate == 'summer')

-                $newrefgmtdate = $yearref . '-08-01';

-            else

-                $newrefgmtdate = $yearref . '-01-01';

+            if ($refgmtdate == 'now') {
+                            $newrefgmtdate = $yearref . '-' . $monthref . '-' . $dayref;
+            } elseif ($refgmtdate == 'summer') {
+                            $newrefgmtdate = $yearref . '-08-01';
+            } else {
+                            $newrefgmtdate = $yearref . '-01-01';
+            }
             $newrefgmtdate .= 'T00:00:00+00:00';

             $localtz = new DateTimeZone(getServerTimeZoneString());

             $localdt = new DateTime($newrefgmtdate, $localtz);

             $tmp = -1 * $localtz->getOffset($localdt);

             //print $refgmtdate.'='.$tmp;

-        }

-        else {

+        } else {

             $tmp = 0;

             dol_print_error('', 'PHP version must be 5.3+');

         }

@@ -120,12 +120,15 @@ 
     {

         global $conf;

 

-        if ($duration_value == 0)

-            return $time;

-        if ($duration_unit == 'h')

-            return $time + (3600 * $duration_value);

-        if ($duration_unit == 'w')

-            return $time + (3600 * 24 * 7 * $duration_value);

+        if ($duration_value == 0) {
+                    return $time;
+        }
+        if ($duration_unit == 'h') {
+                    return $time + (3600 * $duration_value);
+        }
+        if ($duration_unit == 'w') {
+                    return $time + (3600 * 24 * 7 * $duration_value);
+        }
 

         $deltastring = 'P';

 

@@ -148,15 +151,17 @@ 
         }

 

         $date = new DateTime();

-        if (!empty($conf->global->MAIN_DATE_IN_MEMORY_ARE_GMT))

-            $date->setTimezone(new DateTimeZone('UTC'));

+        if (!empty($conf->global->MAIN_DATE_IN_MEMORY_ARE_GMT)) {
+                    $date->setTimezone(new DateTimeZone('UTC'));
+        }
         $date->setTimestamp($time);

         $interval = new DateInterval($deltastring);

 

-        if ($sub)

-            $date->sub($interval);

-        else

-            $date->add($interval);

+        if ($sub) {
+                    $date->sub($interval);
+        } else {
+                    $date->add($interval);
+        }
 

         return $date->getTimestamp();

     }

@@ -200,14 +205,20 @@ 
     {

         global $langs;

 

-        if (empty($lengthOfDay))

-            $lengthOfDay = 86400;         // 1 day = 24 hours

-        if (empty($lengthOfWeek))

-            $lengthOfWeek = 7;            // 1 week = 7 days

+        if (empty($lengthOfDay)) {
+                    $lengthOfDay = 86400;
+        }
+        // 1 day = 24 hours

+        if (empty($lengthOfWeek)) {
+                    $lengthOfWeek = 7;
+        }
+        // 1 week = 7 days

 

         if ($format == 'all' || $format == 'allwithouthour' || $format == 'allhour' || $format == 'allhourmin') {

-            if ((int) $iSecond === 0)

-                return '0'; // This is to avoid having 0 return a 12:00 AM for en_US

+            if ((int) $iSecond === 0) {
+                            return '0';
+            }
+            // This is to avoid having 0 return a 12:00 AM for en_US

 

             $sTime = '';

             $sDay = 0;

@@ -219,8 +230,9 @@ 
                     $iSecond -= $lengthOfDay;

                 }

                 $dayTranslate = $langs->trans("Day");

-                if ($iSecond >= ($lengthOfDay * 2))

-                    $dayTranslate = $langs->trans("Days");

+                if ($iSecond >= ($lengthOfDay * 2)) {
+                                    $dayTranslate = $langs->trans("Days");
+                }
             }

 

             if ($lengthOfWeek < 7) {

@@ -229,16 +241,18 @@ 
                         $sWeek = (int) (($sDay - $sDay % $lengthOfWeek ) / $lengthOfWeek);

                         $sDay = $sDay % $lengthOfWeek;

                         $weekTranslate = $langs->trans("DurationWeek");

-                        if ($sWeek >= 2)

-                            $weekTranslate = $langs->trans("DurationWeeks");

+                        if ($sWeek >= 2) {
+                                                    $weekTranslate = $langs->trans("DurationWeeks");
+                        }
                         $sTime .= $sWeek . ' ' . $weekTranslate . ' ';

                     }

                 }

             }

             if ($sDay > 0) {

                 $dayTranslate = $langs->trans("Day");

-                if ($sDay > 1)

-                    $dayTranslate = $langs->trans("Days");

+                if ($sDay > 1) {
+                                    $dayTranslate = $langs->trans("Days");
+                }
                 $sTime .= $sDay . ' ' . $dayTranslate . ' ';

             }

 

@@ -294,8 +308,9 @@ 
             } else if ($year_date > 0 && !empty($day_date)) {

                 $sqldate .= " AND " . $datefield . " BETWEEN '" . $db->idate(dol_mktime(0, 0, 0, $month_date, $day_date, $year_date));

                 $sqldate .= "' AND '" . $db->idate(dol_mktime(23, 59, 59, $month_date, $day_date, $year_date)) . "'";

-            } else

-                $sqldate .= " AND date_format( " . $datefield . ", '%m') = '" . $db->escape($month_date) . "'";

+            } else {
+                            $sqldate .= " AND date_format( " . $datefield . ", '%m') = '" . $db->escape($month_date) . "'";
+            }
         } else if ($year_date > 0) {

             $sqldate .= " AND " . $datefield . " BETWEEN '" . $db->idate(dol_get_first_day($year_date, 1, false));

             $sqldate .= "' AND '" . $db->idate(dol_get_last_day($year_date, 12, false)) . "'";

@@ -334,13 +349,14 @@ 
             $shour = $reg[4];

             $smin = $reg[5];

             $ssec = $reg[6];

-            if ($syear < 50)

-                $syear += 1900;

-            if ($syear >= 50 && $syear < 100)

-                $syear += 2000;

+            if ($syear < 50) {
+                            $syear += 1900;
+            }
+            if ($syear >= 50 && $syear < 100) {
+                            $syear += 2000;
+            }
             $string = sprintf("%04d%02d%02d%02d%02d%02d", $syear, $smonth, $sday, $shour, $smin, $ssec);

-        }

-        else if (

+        } else if (

             preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z$/i', $string, $reg) // Convert date with format YYYY-MM-DDTHH:MM:SSZ (RFC3339)

             || preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})$/i', $string, $reg) // Convert date with format YYYY-MM-DD HH:MM:SS

             || preg_match('/^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2})([0-9]{2})([0-9]{2})Z$/i', $string, $reg)  // Convert date with format YYYYMMDDTHHMMSSZ

@@ -474,8 +490,9 @@ 
      */

     function dol_get_first_day($year, $month = 1, $gm = false)

     {

-        if ($year > 9999)

-            return '';

+        if ($year > 9999) {
+                    return '';
+        }
         return dol_mktime(0, 0, 0, $month, 1, $year, $gm);

     }

 

@@ -488,8 +505,9 @@ 
      */

     function dol_get_last_day($year, $month = 12, $gm = false)

     {

-        if ($year > 9999)

-            return '';

+        if ($year > 9999) {
+                    return '';
+        }
         if ($month == 12) {

             $month = 1;

             $year += 1;

@@ -525,8 +543,9 @@ 
         $tmparray = dol_getdate($date, true); // detail of current day

         //Calculate days = offset from current day

         $days = $start_week - $tmparray['wday'];

-        if ($days >= 1)

-            $days = 7 - $days;

+        if ($days >= 1) {
+                    $days = 7 - $days;
+        }
         $days = abs($days);

         $seconds = $days * 24 * 60 * 60;

         //print 'start_week='.$start_week.' tmparray[wday]='.$tmparray['wday'].' day offset='.$days.' seconds offset='.$seconds.'<br>';

@@ -590,8 +609,9 @@ 
         $nbFerie = 0;

 

         // Check to ensure we use correct parameters

-        if ((($timestampEnd - $timestampStart) % 86400) != 0)

-            return 'ErrorDates must use same hours and must be GMT dates';

+        if ((($timestampEnd - $timestampStart) % 86400) != 0) {
+                    return 'ErrorDates must use same hours and must be GMT dates';
+        }
 

         $i = 0;

         while (( ($lastday == 0 && $timestampStart < $timestampEnd) || ($lastday && $timestampStart <= $timestampEnd) ) && ($i < 50000)) {  // Loop end when equals (Test on i is a security loop to avoid infinite loop)

@@ -610,12 +630,13 @@ 
                 foreach ($arrayofdaystring as $daystring) {

                     $tmp = explode('-', $daystring);

                     if ($tmp[2]) {

-                        if ($tmp[0] == $annee && $tmp[1] == $mois && $tmp[2] == $jour)

-                            $ferie = true;

-                    }

-                    else {

-                        if ($tmp[0] == $mois && $tmp[1] == $jour)

-                            $ferie = true;

+                        if ($tmp[0] == $annee && $tmp[1] == $mois && $tmp[2] == $jour) {
+                                                    $ferie = true;
+                        }
+                    } else {

+                        if ($tmp[0] == $mois && $tmp[1] == $jour) {
+                                                    $ferie = true;
+                        }
                     }

                 }

             }

@@ -624,22 +645,38 @@ 
                 $countryfound = 1;

 

                 // Definition of fixed working days

-                if ($jour == 1 && $mois == 1)

-                    $ferie = true; // 1er january

-                if ($jour == 1 && $mois == 5)

-                    $ferie = true; // 1er may

-                if ($jour == 8 && $mois == 5)

-                    $ferie = true; // 5 may

-                if ($jour == 14 && $mois == 7)

-                    $ferie = true; // 14 july

-                if ($jour == 15 && $mois == 8)

-                    $ferie = true; // 15 august

-                if ($jour == 1 && $mois == 11)

-                    $ferie = true; // 1 november

-                if ($jour == 11 && $mois == 11)

-                    $ferie = true; // 11 november

-                if ($jour == 25 && $mois == 12)

-                    $ferie = true; // 25 december

+                if ($jour == 1 && $mois == 1) {
+                                    $ferie = true;
+                }
+                // 1er january

+                if ($jour == 1 && $mois == 5) {
+                                    $ferie = true;
+                }
+                // 1er may

+                if ($jour == 8 && $mois == 5) {
+                                    $ferie = true;
+                }
+                // 5 may

+                if ($jour == 14 && $mois == 7) {
+                                    $ferie = true;
+                }
+                // 14 july

+                if ($jour == 15 && $mois == 8) {
+                                    $ferie = true;
+                }
+                // 15 august

+                if ($jour == 1 && $mois == 11) {
+                                    $ferie = true;
+                }
+                // 1 november

+                if ($jour == 11 && $mois == 11) {
+                                    $ferie = true;
+                }
+                // 11 november

+                if ($jour == 25 && $mois == 12) {
+                                    $ferie = true;
+                }
+                // 25 december

 

 

                     

@@ -647,8 +684,9 @@ 
                 $date_paques = easter_date($annee);

                 $jour_paques = date("d", $date_paques);

                 $mois_paques = date("m", $date_paques);

-                if ($jour_paques == $jour && $mois_paques == $mois)

-                    $ferie = true;

+                if ($jour_paques == $jour && $mois_paques == $mois) {
+                                    $ferie = true;
+                }
                 // Pâques

                 // Calculation for the monday of easter date

                 $date_lundi_paques = mktime(

@@ -656,8 +694,9 @@ 
                 );

                 $jour_lundi_ascension = date("d", $date_lundi_paques);

                 $mois_lundi_ascension = date("m", $date_lundi_paques);

-                if ($jour_lundi_ascension == $jour && $mois_lundi_ascension == $mois)

-                    $ferie = true;

+                if ($jour_lundi_ascension == $jour && $mois_lundi_ascension == $mois) {
+                                    $ferie = true;
+                }
                 // Lundi de Pâques

                 // Calcul du jour de l'ascension (38 days after easter day)

                 $date_ascension = mktime(

@@ -665,8 +704,9 @@ 
                 );

                 $jour_ascension = date("d", $date_ascension);

                 $mois_ascension = date("m", $date_ascension);

-                if ($jour_ascension == $jour && $mois_ascension == $mois)

-                    $ferie = true;

+                if ($jour_ascension == $jour && $mois_ascension == $mois) {
+                                    $ferie = true;
+                }
                 // Ascension

                 // Calculation of "Pentecote" (11 days after easter day)

                 $date_pentecote = mktime(

@@ -674,8 +714,9 @@ 
                 );

                 $jour_pentecote = date("d", $date_pentecote);

                 $mois_pentecote = date("m", $date_pentecote);

-                if ($jour_pentecote == $jour && $mois_pentecote == $mois)

-                    $ferie = true;

+                if ($jour_pentecote == $jour && $mois_pentecote == $mois) {
+                                    $ferie = true;
+                }
                 // "Pentecote"

             }

 

@@ -685,26 +726,46 @@ 
                 $countryfound = 1;

 

                 // Definition des dates feriees fixes

-                if ($jour == 1 && $mois == 1)

-                    $ferie = true; // Capodanno

-                if ($jour == 6 && $mois == 1)

-                    $ferie = true; // Epifania

-                if ($jour == 25 && $mois == 4)

-                    $ferie = true; // Anniversario Liberazione

-                if ($jour == 1 && $mois == 5)

-                    $ferie = true; // Festa del Lavoro

-                if ($jour == 2 && $mois == 6)

-                    $ferie = true; // Festa della Repubblica

-                if ($jour == 15 && $mois == 8)

-                    $ferie = true; // Ferragosto

-                if ($jour == 1 && $mois == 11)

-                    $ferie = true; // Tutti i Santi

-                if ($jour == 8 && $mois == 12)

-                    $ferie = true; // Immacolata Concezione

-                if ($jour == 25 && $mois == 12)

-                    $ferie = true; // 25 decembre

-                if ($jour == 26 && $mois == 12)

-                    $ferie = true; // Santo Stefano

+                if ($jour == 1 && $mois == 1) {
+                                    $ferie = true;
+                }
+                // Capodanno

+                if ($jour == 6 && $mois == 1) {
+                                    $ferie = true;
+                }
+                // Epifania

+                if ($jour == 25 && $mois == 4) {
+                                    $ferie = true;
+                }
+                // Anniversario Liberazione

+                if ($jour == 1 && $mois == 5) {
+                                    $ferie = true;
+                }
+                // Festa del Lavoro

+                if ($jour == 2 && $mois == 6) {
+                                    $ferie = true;
+                }
+                // Festa della Repubblica

+                if ($jour == 15 && $mois == 8) {
+                                    $ferie = true;
+                }
+                // Ferragosto

+                if ($jour == 1 && $mois == 11) {
+                                    $ferie = true;
+                }
+                // Tutti i Santi

+                if ($jour == 8 && $mois == 12) {
+                                    $ferie = true;
+                }
+                // Immacolata Concezione

+                if ($jour == 25 && $mois == 12) {
+                                    $ferie = true;
+                }
+                // 25 decembre

+                if ($jour == 26 && $mois == 12) {
+                                    $ferie = true;
+                }
+                // Santo Stefano

 

 

                     

@@ -712,50 +773,81 @@ 
                 $date_paques = easter_date($annee);

                 $jour_paques = date("d", $date_paques);

                 $mois_paques = date("m", $date_paques);

-                if ($jour_paques == $jour && $mois_paques == $mois)

-                    $ferie = true;

+                if ($jour_paques == $jour && $mois_paques == $mois) {
+                                    $ferie = true;
+                }
                 // Paques

             }

 

             if ($countrycode == 'IN') {

                 $countryfound = 1;

 

-                if ($jour == 1 && $mois == 1)

-                    $ferie = true; // New Year's Day

-                if ($jour == 26 && $mois == 1)

-                    $ferie = true; // Republic Day

-                if ($jour == 1 && $mois == 5)

-                    $ferie = true; // May Day

-                if ($jour == 15 && $mois == 8)

-                    $ferie = true; // Independence Day

-                if ($jour == 2 && $mois == 10)

-                    $ferie = true; // Gandhi Jayanti

-                if ($jour == 25 && $mois == 12)

-                    $ferie = true; // Christmas

+                if ($jour == 1 && $mois == 1) {
+                                    $ferie = true;
+                }
+                // New Year's Day

+                if ($jour == 26 && $mois == 1) {
+                                    $ferie = true;
+                }
+                // Republic Day

+                if ($jour == 1 && $mois == 5) {
+                                    $ferie = true;
+                }
+                // May Day

+                if ($jour == 15 && $mois == 8) {
+                                    $ferie = true;
+                }
+                // Independence Day

+                if ($jour == 2 && $mois == 10) {
+                                    $ferie = true;
+                }
+                // Gandhi Jayanti

+                if ($jour == 25 && $mois == 12) {
+                                    $ferie = true;
+                }
+                // Christmas

             }

 

             if ($countrycode == 'ES') {

                 $countryfound = 1;

 

                 // Definition des dates feriees fixes

-                if ($jour == 1 && $mois == 1)

-                    $ferie = true; // Año nuevo

-                if ($jour == 6 && $mois == 1)

-                    $ferie = true; // Día Reyes

-                if ($jour == 1 && $mois == 5)

-                    $ferie = true; // 1 Mayo

-                if ($jour == 15 && $mois == 8)

-                    $ferie = true; // 15 Agosto

-                if ($jour == 12 && $mois == 10)

-                    $ferie = true; // Día Hispanidad

-                if ($jour == 1 && $mois == 11)

-                    $ferie = true; // 1 noviembre

-                if ($jour == 6 && $mois == 12)

-                    $ferie = true; // Constitución

-                if ($jour == 8 && $mois == 12)

-                    $ferie = true; // Inmaculada

-                if ($jour == 25 && $mois == 12)

-                    $ferie = true; // 25 diciembre

+                if ($jour == 1 && $mois == 1) {
+                                    $ferie = true;
+                }
+                // Año nuevo

+                if ($jour == 6 && $mois == 1) {
+                                    $ferie = true;
+                }
+                // Día Reyes

+                if ($jour == 1 && $mois == 5) {
+                                    $ferie = true;
+                }
+                // 1 Mayo

+                if ($jour == 15 && $mois == 8) {
+                                    $ferie = true;
+                }
+                // 15 Agosto

+                if ($jour == 12 && $mois == 10) {
+                                    $ferie = true;
+                }
+                // Día Hispanidad

+                if ($jour == 1 && $mois == 11) {
+                                    $ferie = true;
+                }
+                // 1 noviembre

+                if ($jour == 6 && $mois == 12) {
+                                    $ferie = true;
+                }
+                // Constitución

+                if ($jour == 8 && $mois == 12) {
+                                    $ferie = true;
+                }
+                // Inmaculada

+                if ($jour == 25 && $mois == 12) {
+                                    $ferie = true;
+                }
+                // 25 diciembre

 

 

                     

@@ -763,8 +855,9 @@ 
                 $date_paques = easter_date($annee);

                 $jour_paques = date("d", $date_paques);

                 $mois_paques = date("m", $date_paques);

-                if ($jour_paques == $jour && $mois_paques == $mois)

-                    $ferie = true;

+                if ($jour_paques == $jour && $mois_paques == $mois) {
+                                    $ferie = true;
+                }
                 // Paques

                 // Viernes Santo

                 $date_viernes = mktime(

@@ -772,8 +865,9 @@ 
                 );

                 $jour_viernes = date("d", $date_viernes);

                 $mois_viernes = date("m", $date_viernes);

-                if ($jour_viernes == $jour && $mois_viernes == $mois)

-                    $ferie = true;

+                if ($jour_viernes == $jour && $mois_viernes == $mois) {
+                                    $ferie = true;
+                }
                 //Viernes Santo

             }

 

@@ -781,28 +875,50 @@ 
                 $countryfound = 1;

 

                 // Definition des dates feriees fixes

-                if ($jour == 1 && $mois == 1)

-                    $ferie = true; // Neujahr

-                if ($jour == 6 && $mois == 1)

-                    $ferie = true; // Hl. 3 Koenige

-                if ($jour == 1 && $mois == 5)

-                    $ferie = true; // 1. Mai

-                if ($jour == 15 && $mois == 8)

-                    $ferie = true; // Mariae Himmelfahrt

-                if ($jour == 26 && $mois == 10)

-                    $ferie = true; // 26. Oktober

-                if ($jour == 1 && $mois == 11)

-                    $ferie = true; // Allerheiligen

-                if ($jour == 8 && $mois == 12)

-                    $ferie = true; // Mariae Empfaengnis

-                if ($jour == 24 && $mois == 12)

-                    $ferie = true; // Heilig abend

-                if ($jour == 25 && $mois == 12)

-                    $ferie = true; // Christtag

-                if ($jour == 26 && $mois == 12)

-                    $ferie = true; // Stefanietag

-                if ($jour == 31 && $mois == 12)

-                    $ferie = true; // Silvester

+                if ($jour == 1 && $mois == 1) {
+                                    $ferie = true;
+                }
+                // Neujahr

+                if ($jour == 6 && $mois == 1) {
+                                    $ferie = true;
+                }
+                // Hl. 3 Koenige

+                if ($jour == 1 && $mois == 5) {
+                                    $ferie = true;
+                }
+                // 1. Mai

+                if ($jour == 15 && $mois == 8) {
+                                    $ferie = true;
+                }
+                // Mariae Himmelfahrt

+                if ($jour == 26 && $mois == 10) {
+                                    $ferie = true;
+                }
+                // 26. Oktober

+                if ($jour == 1 && $mois == 11) {
+                                    $ferie = true;
+                }
+                // Allerheiligen

+                if ($jour == 8 && $mois == 12) {
+                                    $ferie = true;
+                }
+                // Mariae Empfaengnis

+                if ($jour == 24 && $mois == 12) {
+                                    $ferie = true;
+                }
+                // Heilig abend

+                if ($jour == 25 && $mois == 12) {
+                                    $ferie = true;
+                }
+                // Christtag

+                if ($jour == 26 && $mois == 12) {
+                                    $ferie = true;
+                }
+                // Stefanietag

+                if ($jour == 31 && $mois == 12) {
+                                    $ferie = true;
+                }
+                // Silvester

 

 

                     

@@ -810,8 +926,9 @@ 
                 $date_paques = easter_date($annee);

                 $jour_paques = date("d", $date_paques);

                 $mois_paques = date("m", $date_paques);

-                if ($jour_paques == $jour && $mois_paques == $mois)

-                    $ferie = true;

+                if ($jour_paques == $jour && $mois_paques == $mois) {
+                                    $ferie = true;
+                }
                 // Easter sunday

                 // Monday after easter

                 $date_eastermonday = mktime(

@@ -819,8 +936,9 @@ 
                 );

                 $jour_eastermonday = date("d", $date_eastermonday);

                 $mois_eastermonday = date("m", $date_eastermonday);

-                if ($jour_eastermonday == $jour && $mois_eastermonday == $mois)

-                    $ferie = true;

+                if ($jour_eastermonday == $jour && $mois_eastermonday == $mois) {
+                                    $ferie = true;
+                }
                 // Easter monday

                 // Christi Himmelfahrt (39 days after easter sunday)

                 $date_ch = mktime(

@@ -828,8 +946,9 @@ 
                 );

                 $jour_ch = date("d", $date_ch);

                 $mois_ch = date("m", $date_ch);

-                if ($jour_ch == $jour && $mois_ch == $mois)

-                    $ferie = true;

+                if ($jour_ch == $jour && $mois_ch == $mois) {
+                                    $ferie = true;
+                }
                 // Christi Himmelfahrt

                 // Pfingsten (50 days after easter sunday)

                 $date_pentecote = mktime(

@@ -837,8 +956,9 @@ 
                 );

                 $jour_pentecote = date("d", $date_pentecote);

                 $mois_pentecote = date("m", $date_pentecote);

-                if ($jour_pentecote == $jour && $mois_pentecote == $mois)

-                    $ferie = true;

+                if ($jour_pentecote == $jour && $mois_pentecote == $mois) {
+                                    $ferie = true;
+                }
                 // Pfingsten

                 // Fronleichnam (60 days after easter sunday)

                 $date_fronleichnam = mktime(

@@ -846,8 +966,9 @@ 
                 );

                 $jour_fronleichnam = date("d", $date_fronleichnam);

                 $mois_fronleichnam = date("m", $date_fronleichnam);

-                if ($jour_fronleichnam == $jour && $mois_fronleichnam == $mois)

-                    $ferie = true;

+                if ($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) {
+                                    $ferie = true;
+                }
                 // Fronleichnam

             }

 

@@ -855,14 +976,16 @@ 
             if ($includesaturdayandsunday) {

                 $jour_julien = unixtojd($timestampStart);

                 $jour_semaine = jddayofweek($jour_julien, 0);

-                if ($jour_semaine == 0 || $jour_semaine == 6)

-                    $ferie = true;

+                if ($jour_semaine == 0 || $jour_semaine == 6) {
+                                    $ferie = true;
+                }
                 //Saturday (6) and Sunday (0)

             }

 

             // On incremente compteur

-            if ($ferie)

-                $nbFerie++;

+            if ($ferie) {
+                            $nbFerie++;
+            }
 

             // Increase number of days (on go up into loop)

             $timestampStart = dol_time_plus_duree($timestampStart, 1, 'd');

@@ -914,16 +1037,19 @@ 
     {

         global $langs, $mysoc;

 

-        if (empty($country_code))

-            $country_code = $mysoc->country_code;

+        if (empty($country_code)) {
+                    $country_code = $mysoc->country_code;
+        }
 

         dol_syslog('num_open_day timestampStart=' . $timestampStart . ' timestampEnd=' . $timestampEnd . ' bit=' . $lastday . ' country_code=' . $country_code);

 

         // Check parameters

-        if (!is_int($timestampStart) && !is_float($timestampStart))

-            return 'ErrorBadParameter_num_open_day';

-        if (!is_int($timestampEnd) && !is_float($timestampEnd))

-            return 'ErrorBadParameter_num_open_day';

+        if (!is_int($timestampStart) && !is_float($timestampStart)) {
+                    return 'ErrorBadParameter_num_open_day';
+        }
+        if (!is_int($timestampEnd) && !is_float($timestampEnd)) {
+                    return 'ErrorBadParameter_num_open_day';
+        }
 

         //print 'num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday;

         if ($timestampStart < $timestampEnd) {

@@ -931,17 +1057,17 @@ 
             $numholidays = num_public_holiday($timestampStart, $timestampEnd, $country_code, $lastday);

             $nbOpenDay = $numdays - $numholidays;

             $nbOpenDay .= " " . $langs->trans("Days");

-            if ($inhour == 1 && $nbOpenDay <= 3)

-                $nbOpenDay = $nbOpenDay * 24 . $langs->trans("HourShort");

+            if ($inhour == 1 && $nbOpenDay <= 3) {
+                            $nbOpenDay = $nbOpenDay * 24 . $langs->trans("HourShort");
+            }
             return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));

-        }

-        elseif ($timestampStart == $timestampEnd) {

+        } elseif ($timestampStart == $timestampEnd) {

             $nbOpenDay = $lastday;

-            if ($inhour == 1)

-                $nbOpenDay = $nbOpenDay * 24 . $langs->trans("HourShort");

+            if ($inhour == 1) {
+                            $nbOpenDay = $nbOpenDay * 24 . $langs->trans("HourShort");
+            }
             return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));

-        }

-        else {

+        } else {

             return $langs->trans("Error");

         }

     }

Helpers/triggers/interface_50_modLdap_Ldapsynchro.class.php

Indentation +771 added lines, -771 removed lines

@@ -31,781 +31,781 @@
  */

 class InterfaceLdapsynchro extends DolibarrTriggers

 {

-	public $family = 'ldap';

-	public $description = "Triggers of this module allows to synchronize Dolibarr toward a LDAP database.";

-

-	/**

-	 * Version of the trigger

-	 * @var string

-	 */

-	public $version = self::VERSION_DOLIBARR;

-

-	/**

-	 * @var string Image of the trigger

-	 */

-	public $picto = 'technic';

-

-	/**

-	 * Function called when a Dolibarrr business event is done.

-	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)

-	 *

-	 * @param string		$action		Event action code

-	 * @param Object		$object     Object

-	 * @param User		    $user       Object user

-	 * @param Translate 	$langs      Object langs

-	 * @param conf		    $conf       Object conf

-	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK

-	 */

-	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)

-	{

-		if (empty($conf->ldap->enabled)) return 0;		// Module not active, we do nothing

-		if (defined('DISABLE_LDAP_SYNCHRO')) return 0;	// If constant defined, we do nothing

-

-		if (! function_exists('ldap_connect'))

-		{

-			dol_syslog("Warning, module LDAP is enabled but LDAP functions not available in this PHP", LOG_WARNING);

-			return 0;

-		}

-

-		require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php";

-		require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php";

-

-		$result=0;

-

-		// Users

-		if ($action == 'USER_CREATE')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					$result=$ldap->add($dn,$info,$user);

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-		elseif ($action == 'USER_MODIFY')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					if (empty($object->oldcopy) || ! is_object($object->oldcopy))

-					{

-						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

-						$object->oldcopy = clone $object;

-					}

-

-					$oldinfo=$object->oldcopy->_load_ldap_info();

-					$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

-

-					// Verify if entry exist

-					$container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

-					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

-					$records=$ldap->search($container,$search);

-					if (count($records) && $records['count'] == 0)

-					{

-						$olddn = '';

-					}

-

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-					$newrdn=$object->_load_ldap_dn($info,2);

-					$newparent=$object->_load_ldap_dn($info,1);

-

-					$result=$ldap->update($dn,$info,$user,$olddn,$newrdn,$newparent);

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-		elseif ($action == 'USER_NEW_PASSWORD')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					if (empty($object->oldcopy) || ! is_object($object->oldcopy))

-					{

-						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

-						$object->oldcopy = clone $object;

-					}

-

-					$oldinfo=$object->oldcopy->_load_ldap_info();

-					$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

-

-					// Verify if entry exist

-					$container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

-					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

-					$records=$ldap->search($container,$search);

-					if (count($records) && $records['count'] == 0)

-					{

-						$olddn = '';

-					}

-

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					$result=$ldap->update($dn,$info,$user,$olddn);

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-		elseif ($action == 'USER_ENABLEDISABLE')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-		}

-		elseif ($action == 'USER_DELETE')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					$result=$ldap->delete($dn);

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-		elseif ($action == 'USER_SETINGROUP')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					// Must edit $object->newgroupid

-					$usergroup=new UserGroup($this->db);

-					if ($object->newgroupid > 0)

-					{

-						$usergroup->fetch($object->newgroupid);

-

-						$oldinfo=$usergroup->_load_ldap_info();

-						$olddn=$usergroup->_load_ldap_dn($oldinfo);

-

-						// Verify if entry exist

-						$container=$usergroup->_load_ldap_dn($oldinfo,1);

-						$search = "(".$usergroup->_load_ldap_dn($oldinfo,2).")";

-						$records=$ldap->search($container,$search);

-						if (count($records) && $records['count'] == 0)

-						{

-							$olddn = '';

-						}

-

-						$info=$usergroup->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

-						$dn=$usergroup->_load_ldap_dn($info);

-

-						$result=$ldap->update($dn,$info,$user,$olddn);

-					}

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-		elseif ($action == 'USER_REMOVEFROMGROUP')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					// Must edit $object->newgroupid

-					$usergroup=new UserGroup($this->db);

-					if ($object->oldgroupid > 0)

-					{

-						$usergroup->fetch($object->oldgroupid);

-

-						$oldinfo=$usergroup->_load_ldap_info();

-						$olddn=$usergroup->_load_ldap_dn($oldinfo);

-

-						// Verify if entry exist

-						$container=$usergroup->_load_ldap_dn($oldinfo,1);

-						$search = "(".$usergroup->_load_ldap_dn($oldinfo,2).")";

-						$records=$ldap->search($container,$search);

-						if (count($records) && $records['count'] == 0)

-						{

-							$olddn = '';

-						}

-

-						$info=$usergroup->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

-						$dn=$usergroup->_load_ldap_dn($info);

-

-						$result=$ldap->update($dn,$info,$user,$olddn);

-					}

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-

-		// Groupes

-		elseif ($action == 'GROUP_CREATE')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					// Get a gid number for objectclass PosixGroup

-					if (in_array('posixGroup',$info['objectclass'])) {

-						$info['gidNumber'] = $ldap->getNextGroupGid('LDAP_KEY_GROUPS');

-					}

-

-					$result=$ldap->add($dn,$info,$user);

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-		elseif ($action == 'GROUP_MODIFY')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					if (empty($object->oldcopy) || ! is_object($object->oldcopy))

-					{

-						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

-						$object->oldcopy = clone $object;

-					}

-

-					$oldinfo=$object->oldcopy->_load_ldap_info();

-					$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

-

-					// Verify if entry exist

-					$container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

-					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

-					$records=$ldap->search($container,$search);

-					if (count($records) && $records['count'] == 0)

-					{

-						$olddn = '';

-					}

-

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					$result=$ldap->update($dn,$info,$user,$olddn);

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-		elseif ($action == 'GROUP_DELETE')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					$result=$ldap->delete($dn);

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-

-		// Contacts

-		elseif ($action == 'CONTACT_CREATE')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_CONTACT_ACTIVE))

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					$result=$ldap->add($dn,$info,$user);

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-		elseif ($action == 'CONTACT_MODIFY')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_CONTACT_ACTIVE))

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					if (empty($object->oldcopy) || ! is_object($object->oldcopy))

-					{

-						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

-						$object->oldcopy = clone $object;

-					}

-

-					$oldinfo=$object->oldcopy->_load_ldap_info();

-					$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

-

-					// Verify if entry exist

-					$container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

-					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

-					$records=$ldap->search($container,$search);

-					if (count($records) && $records['count'] == 0)

-					{

-						$olddn = '';

-					}

-

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					$result=$ldap->update($dn,$info,$user,$olddn);

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-		elseif ($action == 'CONTACT_DELETE')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_CONTACT_ACTIVE))

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					$result=$ldap->delete($dn);

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-

-		// Members

-		elseif ($action == 'MEMBER_CREATE')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					$result=$ldap->add($dn,$info,$user);

-

-					// For member type

-					if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

-					{

-						$membertype=new AdherentType($this->db);

-						if ($object->typeid > 0)

-						{

-							$membertype->fetch($object->typeid);

-							$membertype->listMembersForMemberType('', 1);

-

-							$oldinfo=$membertype->_load_ldap_info();

-							$olddn=$membertype->_load_ldap_dn($oldinfo);

-

-							// Verify if entry exist

-							$container=$membertype->_load_ldap_dn($oldinfo,1);

-							$search = "(".$membertype->_load_ldap_dn($oldinfo,2).")";

-							$records=$ldap->search($container,$search);

-							if (count($records) && $records['count'] == 0)

-							{

-								$olddn = '';

-							}

-

-							$info=$membertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

-							$dn=$membertype->_load_ldap_dn($info);

-

-							$result=$ldap->update($dn,$info,$user,$olddn);

-						}

-					}

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-		elseif ($action == 'MEMBER_VALIDATE')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

-			{

-				// If status field is setup to be synchronized

-				if (! empty($conf->global->LDAP_FIELD_MEMBER_STATUS))

-				{

-					$ldap=new Ldap();

-					$result=$ldap->connect_bind();

-

-					if ($result > 0)

-					{

-						$info=$object->_load_ldap_info();

-						$dn=$object->_load_ldap_dn($info);

-						$olddn=$dn;	// We know olddn=dn as we change only status

-

-						$result=$ldap->update($dn,$info,$user,$olddn);

-					}

-

-					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-				}

-			}

-		}

-		elseif ($action == 'MEMBER_SUBSCRIPTION')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

-			{

-				// If subscriptions fields are setup to be synchronized

-				if ($conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE

-					|| $conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT

-					|| $conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE

-					|| $conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT

-					|| $conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION)

-				{

-					$ldap=new Ldap();

-					$result=$ldap->connect_bind();

-

-					if ($result > 0)

-					{

-						$info=$object->_load_ldap_info();

-						$dn=$object->_load_ldap_dn($info);

-						$olddn=$dn;	// We know olddn=dn as we change only subscriptions

-

-						$result=$ldap->update($dn,$info,$user,$olddn);

-					}

-

-					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-				}

-			}

-		}

-		elseif ($action == 'MEMBER_MODIFY')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					if (empty($object->oldcopy) || ! is_object($object->oldcopy))

-					{

-						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

-						$object->oldcopy = clone $object;

-					}

-

-					$oldinfo=$object->oldcopy->_load_ldap_info();

-					$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

-

-					// Verify if entry exist

-					$container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

-					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

-					$records=$ldap->search($container,$search);

-					if (count($records) && $records['count'] == 0)

-					{

-						$olddn = '';

-					}

-

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-					$newrdn=$object->_load_ldap_dn($info,2);

-					$newparent=$object->_load_ldap_dn($info,1);

-

-					$result=$ldap->update($dn,$info,$user,$olddn,$newrdn,$newparent);

-

-					// For member type

-					if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

-					{

-						/*

+    public $family = 'ldap';

+    public $description = "Triggers of this module allows to synchronize Dolibarr toward a LDAP database.";

+

+    /**

+     * Version of the trigger

+     * @var string

+     */

+    public $version = self::VERSION_DOLIBARR;

+

+    /**

+     * @var string Image of the trigger

+     */

+    public $picto = 'technic';

+

+    /**

+     * Function called when a Dolibarrr business event is done.

+     * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)

+     *

+     * @param string		$action		Event action code

+     * @param Object		$object     Object

+     * @param User		    $user       Object user

+     * @param Translate 	$langs      Object langs

+     * @param conf		    $conf       Object conf

+     * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK

+     */

+    public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)

+    {

+        if (empty($conf->ldap->enabled)) return 0;		// Module not active, we do nothing

+        if (defined('DISABLE_LDAP_SYNCHRO')) return 0;	// If constant defined, we do nothing

+

+        if (! function_exists('ldap_connect'))

+        {

+            dol_syslog("Warning, module LDAP is enabled but LDAP functions not available in this PHP", LOG_WARNING);

+            return 0;

+        }

+

+        require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php";

+        require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php";

+

+        $result=0;

+

+        // Users

+        if ($action == 'USER_CREATE')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    $result=$ldap->add($dn,$info,$user);

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+        elseif ($action == 'USER_MODIFY')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    if (empty($object->oldcopy) || ! is_object($object->oldcopy))

+                    {

+                        dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

+                        $object->oldcopy = clone $object;

+                    }

+

+                    $oldinfo=$object->oldcopy->_load_ldap_info();

+                    $olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

+

+                    // Verify if entry exist

+                    $container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

+                    $search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

+                    $records=$ldap->search($container,$search);

+                    if (count($records) && $records['count'] == 0)

+                    {

+                        $olddn = '';

+                    }

+

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+                    $newrdn=$object->_load_ldap_dn($info,2);

+                    $newparent=$object->_load_ldap_dn($info,1);

+

+                    $result=$ldap->update($dn,$info,$user,$olddn,$newrdn,$newparent);

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+        elseif ($action == 'USER_NEW_PASSWORD')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    if (empty($object->oldcopy) || ! is_object($object->oldcopy))

+                    {

+                        dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

+                        $object->oldcopy = clone $object;

+                    }

+

+                    $oldinfo=$object->oldcopy->_load_ldap_info();

+                    $olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

+

+                    // Verify if entry exist

+                    $container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

+                    $search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

+                    $records=$ldap->search($container,$search);

+                    if (count($records) && $records['count'] == 0)

+                    {

+                        $olddn = '';

+                    }

+

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    $result=$ldap->update($dn,$info,$user,$olddn);

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+        elseif ($action == 'USER_ENABLEDISABLE')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+        }

+        elseif ($action == 'USER_DELETE')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    $result=$ldap->delete($dn);

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+        elseif ($action == 'USER_SETINGROUP')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    // Must edit $object->newgroupid

+                    $usergroup=new UserGroup($this->db);

+                    if ($object->newgroupid > 0)

+                    {

+                        $usergroup->fetch($object->newgroupid);

+

+                        $oldinfo=$usergroup->_load_ldap_info();

+                        $olddn=$usergroup->_load_ldap_dn($oldinfo);

+

+                        // Verify if entry exist

+                        $container=$usergroup->_load_ldap_dn($oldinfo,1);

+                        $search = "(".$usergroup->_load_ldap_dn($oldinfo,2).")";

+                        $records=$ldap->search($container,$search);

+                        if (count($records) && $records['count'] == 0)

+                        {

+                            $olddn = '';

+                        }

+

+                        $info=$usergroup->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

+                        $dn=$usergroup->_load_ldap_dn($info);

+

+                        $result=$ldap->update($dn,$info,$user,$olddn);

+                    }

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+        elseif ($action == 'USER_REMOVEFROMGROUP')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    // Must edit $object->newgroupid

+                    $usergroup=new UserGroup($this->db);

+                    if ($object->oldgroupid > 0)

+                    {

+                        $usergroup->fetch($object->oldgroupid);

+

+                        $oldinfo=$usergroup->_load_ldap_info();

+                        $olddn=$usergroup->_load_ldap_dn($oldinfo);

+

+                        // Verify if entry exist

+                        $container=$usergroup->_load_ldap_dn($oldinfo,1);

+                        $search = "(".$usergroup->_load_ldap_dn($oldinfo,2).")";

+                        $records=$ldap->search($container,$search);

+                        if (count($records) && $records['count'] == 0)

+                        {

+                            $olddn = '';

+                        }

+

+                        $info=$usergroup->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

+                        $dn=$usergroup->_load_ldap_dn($info);

+

+                        $result=$ldap->update($dn,$info,$user,$olddn);

+                    }

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+

+        // Groupes

+        elseif ($action == 'GROUP_CREATE')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    // Get a gid number for objectclass PosixGroup

+                    if (in_array('posixGroup',$info['objectclass'])) {

+                        $info['gidNumber'] = $ldap->getNextGroupGid('LDAP_KEY_GROUPS');

+                    }

+

+                    $result=$ldap->add($dn,$info,$user);

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+        elseif ($action == 'GROUP_MODIFY')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    if (empty($object->oldcopy) || ! is_object($object->oldcopy))

+                    {

+                        dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

+                        $object->oldcopy = clone $object;

+                    }

+

+                    $oldinfo=$object->oldcopy->_load_ldap_info();

+                    $olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

+

+                    // Verify if entry exist

+                    $container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

+                    $search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

+                    $records=$ldap->search($container,$search);

+                    if (count($records) && $records['count'] == 0)

+                    {

+                        $olddn = '';

+                    }

+

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    $result=$ldap->update($dn,$info,$user,$olddn);

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+        elseif ($action == 'GROUP_DELETE')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    $result=$ldap->delete($dn);

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+

+        // Contacts

+        elseif ($action == 'CONTACT_CREATE')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_CONTACT_ACTIVE))

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    $result=$ldap->add($dn,$info,$user);

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+        elseif ($action == 'CONTACT_MODIFY')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_CONTACT_ACTIVE))

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    if (empty($object->oldcopy) || ! is_object($object->oldcopy))

+                    {

+                        dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

+                        $object->oldcopy = clone $object;

+                    }

+

+                    $oldinfo=$object->oldcopy->_load_ldap_info();

+                    $olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

+

+                    // Verify if entry exist

+                    $container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

+                    $search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

+                    $records=$ldap->search($container,$search);

+                    if (count($records) && $records['count'] == 0)

+                    {

+                        $olddn = '';

+                    }

+

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    $result=$ldap->update($dn,$info,$user,$olddn);

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+        elseif ($action == 'CONTACT_DELETE')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_CONTACT_ACTIVE))

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    $result=$ldap->delete($dn);

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+

+        // Members

+        elseif ($action == 'MEMBER_CREATE')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    $result=$ldap->add($dn,$info,$user);

+

+                    // For member type

+                    if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

+                    {

+                        $membertype=new AdherentType($this->db);

+                        if ($object->typeid > 0)

+                        {

+                            $membertype->fetch($object->typeid);

+                            $membertype->listMembersForMemberType('', 1);

+

+                            $oldinfo=$membertype->_load_ldap_info();

+                            $olddn=$membertype->_load_ldap_dn($oldinfo);

+

+                            // Verify if entry exist

+                            $container=$membertype->_load_ldap_dn($oldinfo,1);

+                            $search = "(".$membertype->_load_ldap_dn($oldinfo,2).")";

+                            $records=$ldap->search($container,$search);

+                            if (count($records) && $records['count'] == 0)

+                            {

+                                $olddn = '';

+                            }

+

+                            $info=$membertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

+                            $dn=$membertype->_load_ldap_dn($info);

+

+                            $result=$ldap->update($dn,$info,$user,$olddn);

+                        }

+                    }

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+        elseif ($action == 'MEMBER_VALIDATE')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

+            {

+                // If status field is setup to be synchronized

+                if (! empty($conf->global->LDAP_FIELD_MEMBER_STATUS))

+                {

+                    $ldap=new Ldap();

+                    $result=$ldap->connect_bind();

+

+                    if ($result > 0)

+                    {

+                        $info=$object->_load_ldap_info();

+                        $dn=$object->_load_ldap_dn($info);

+                        $olddn=$dn;	// We know olddn=dn as we change only status

+

+                        $result=$ldap->update($dn,$info,$user,$olddn);

+                    }

+

+                    if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+                }

+            }

+        }

+        elseif ($action == 'MEMBER_SUBSCRIPTION')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

+            {

+                // If subscriptions fields are setup to be synchronized

+                if ($conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE

+                    || $conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT

+                    || $conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE

+                    || $conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT

+                    || $conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION)

+                {

+                    $ldap=new Ldap();

+                    $result=$ldap->connect_bind();

+

+                    if ($result > 0)

+                    {

+                        $info=$object->_load_ldap_info();

+                        $dn=$object->_load_ldap_dn($info);

+                        $olddn=$dn;	// We know olddn=dn as we change only subscriptions

+

+                        $result=$ldap->update($dn,$info,$user,$olddn);

+                    }

+

+                    if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+                }

+            }

+        }

+        elseif ($action == 'MEMBER_MODIFY')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    if (empty($object->oldcopy) || ! is_object($object->oldcopy))

+                    {

+                        dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

+                        $object->oldcopy = clone $object;

+                    }

+

+                    $oldinfo=$object->oldcopy->_load_ldap_info();

+                    $olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

+

+                    // Verify if entry exist

+                    $container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

+                    $search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

+                    $records=$ldap->search($container,$search);

+                    if (count($records) && $records['count'] == 0)

+                    {

+                        $olddn = '';

+                    }

+

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+                    $newrdn=$object->_load_ldap_dn($info,2);

+                    $newparent=$object->_load_ldap_dn($info,1);

+

+                    $result=$ldap->update($dn,$info,$user,$olddn,$newrdn,$newparent);

+

+                    // For member type

+                    if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

+                    {

+                        /*

 						 * Change member info

 						 */

-						$newmembertype=new AdherentType($this->db);

-						$newmembertype->fetch($object->typeid);

-						$newmembertype->listMembersForMemberType('', 1);

-

-						$oldinfo=$newmembertype->_load_ldap_info();

-						$olddn=$newmembertype->_load_ldap_dn($oldinfo);

-

-						// Verify if entry exist

-						$container=$newmembertype->_load_ldap_dn($oldinfo,1);

-						$search = "(".$newmembertype->_load_ldap_dn($oldinfo,2).")";

-						$records=$ldap->search($container,$search);

-						if (count($records) && $records['count'] == 0)

-						{

-							$olddn = '';

-						}

-

-						$info=$newmembertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

-						$dn=$newmembertype->_load_ldap_dn($info);

-

-						$result=$ldap->update($dn,$info,$user,$olddn);

-

-						if ($object->oldcopy->typeid != $object->typeid)

-						{

-							/*

+                        $newmembertype=new AdherentType($this->db);

+                        $newmembertype->fetch($object->typeid);

+                        $newmembertype->listMembersForMemberType('', 1);

+

+                        $oldinfo=$newmembertype->_load_ldap_info();

+                        $olddn=$newmembertype->_load_ldap_dn($oldinfo);

+

+                        // Verify if entry exist

+                        $container=$newmembertype->_load_ldap_dn($oldinfo,1);

+                        $search = "(".$newmembertype->_load_ldap_dn($oldinfo,2).")";

+                        $records=$ldap->search($container,$search);

+                        if (count($records) && $records['count'] == 0)

+                        {

+                            $olddn = '';

+                        }

+

+                        $info=$newmembertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

+                        $dn=$newmembertype->_load_ldap_dn($info);

+

+                        $result=$ldap->update($dn,$info,$user,$olddn);

+

+                        if ($object->oldcopy->typeid != $object->typeid)

+                        {

+                            /*

 							 * Remove member in old member type

 							 */

-							$oldmembertype=new AdherentType($this->db);

-							$oldmembertype->fetch($object->oldcopy->typeid);

-							$oldmembertype->listMembersForMemberType('', 1);

-

-							$oldinfo=$oldmembertype->_load_ldap_info();

-							$olddn=$oldmembertype->_load_ldap_dn($oldinfo);

-

-							// Verify if entry exist

-							$container=$oldmembertype->_load_ldap_dn($oldinfo,1);

-							$search = "(".$oldmembertype->_load_ldap_dn($oldinfo,2).")";

-							$records=$ldap->search($container,$search);

-							if (count($records) && $records['count'] == 0)

-							{

-								$olddn = '';

-							}

-

-							$info=$oldmembertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

-							$dn=$oldmembertype->_load_ldap_dn($info);

-

-							$result=$ldap->update($dn,$info,$user,$olddn);

-						}

-					}

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-		elseif ($action == 'MEMBER_NEW_PASSWORD')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

-			{

-				// If password field is setup to be synchronized

-				if ($conf->global->LDAP_FIELD_PASSWORD || $conf->global->LDAP_FIELD_PASSWORD_CRYPTED)

-				{

-					$ldap=new Ldap();

-					$result=$ldap->connect_bind();

-

-					if ($result > 0)

-					{

-						$info=$object->_load_ldap_info();

-						$dn=$object->_load_ldap_dn($info);

-						$olddn=$dn;	// We know olddn=dn as we change only password

-

-						$result=$ldap->update($dn,$info,$user,$olddn);

-					}

-

-					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-				}

-			}

-		}

-		elseif ($action == 'MEMBER_RESILIATE')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

-			{

-				// If status field is setup to be synchronized

-				if (! empty($conf->global->LDAP_FIELD_MEMBER_STATUS))

-				{

-					$ldap=new Ldap();

-					$result=$ldap->connect_bind();

-

-					if ($result > 0)

-					{

-						$info=$object->_load_ldap_info();

-						$dn=$object->_load_ldap_dn($info);

-						$olddn=$dn;	// We know olddn=dn as we change only status

-

-						$result=$ldap->update($dn,$info,$user,$olddn);

-					}

-

-					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-				}

-			}

-		}

-		elseif ($action == 'MEMBER_DELETE')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					$result=$ldap->delete($dn);

-

-					// For member type

-					if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

-					{

-						if ($object->typeid > 0)

-						{

-							/*

+                            $oldmembertype=new AdherentType($this->db);

+                            $oldmembertype->fetch($object->oldcopy->typeid);

+                            $oldmembertype->listMembersForMemberType('', 1);

+

+                            $oldinfo=$oldmembertype->_load_ldap_info();

+                            $olddn=$oldmembertype->_load_ldap_dn($oldinfo);

+

+                            // Verify if entry exist

+                            $container=$oldmembertype->_load_ldap_dn($oldinfo,1);

+                            $search = "(".$oldmembertype->_load_ldap_dn($oldinfo,2).")";

+                            $records=$ldap->search($container,$search);

+                            if (count($records) && $records['count'] == 0)

+                            {

+                                $olddn = '';

+                            }

+

+                            $info=$oldmembertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

+                            $dn=$oldmembertype->_load_ldap_dn($info);

+

+                            $result=$ldap->update($dn,$info,$user,$olddn);

+                        }

+                    }

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+        elseif ($action == 'MEMBER_NEW_PASSWORD')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

+            {

+                // If password field is setup to be synchronized

+                if ($conf->global->LDAP_FIELD_PASSWORD || $conf->global->LDAP_FIELD_PASSWORD_CRYPTED)

+                {

+                    $ldap=new Ldap();

+                    $result=$ldap->connect_bind();

+

+                    if ($result > 0)

+                    {

+                        $info=$object->_load_ldap_info();

+                        $dn=$object->_load_ldap_dn($info);

+                        $olddn=$dn;	// We know olddn=dn as we change only password

+

+                        $result=$ldap->update($dn,$info,$user,$olddn);

+                    }

+

+                    if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+                }

+            }

+        }

+        elseif ($action == 'MEMBER_RESILIATE')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

+            {

+                // If status field is setup to be synchronized

+                if (! empty($conf->global->LDAP_FIELD_MEMBER_STATUS))

+                {

+                    $ldap=new Ldap();

+                    $result=$ldap->connect_bind();

+

+                    if ($result > 0)

+                    {

+                        $info=$object->_load_ldap_info();

+                        $dn=$object->_load_ldap_dn($info);

+                        $olddn=$dn;	// We know olddn=dn as we change only status

+

+                        $result=$ldap->update($dn,$info,$user,$olddn);

+                    }

+

+                    if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+                }

+            }

+        }

+        elseif ($action == 'MEMBER_DELETE')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    $result=$ldap->delete($dn);

+

+                    // For member type

+                    if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

+                    {

+                        if ($object->typeid > 0)

+                        {

+                            /*

 							 * Remove member in member type

 							 */

-							$membertype=new AdherentType($this->db);

-							$membertype->fetch($object->typeid);

-							$membertype->listMembersForMemberType('a.rowid != ' . $object->id, 1); // remove deleted member from the list

-

-							$oldinfo=$membertype->_load_ldap_info();

-							$olddn=$membertype->_load_ldap_dn($oldinfo);

-

-							// Verify if entry exist

-							$container=$membertype->_load_ldap_dn($oldinfo,1);

-							$search = "(".$membertype->_load_ldap_dn($oldinfo,2).")";

-							$records=$ldap->search($container,$search);

-							if (count($records) && $records['count'] == 0)

-							{

-								$olddn = '';

-							}

-

-							$info=$membertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

-							$dn=$membertype->_load_ldap_dn($info);

-

-							$result=$ldap->update($dn,$info,$user,$olddn);

-						}

-					}

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-

-		// Members types

-		elseif ($action == 'MEMBER_TYPE_CREATE')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					// Get a gid number for objectclass PosixGroup

-					if (in_array('posixGroup',$info['objectclass'])) {

-						$info['gidNumber'] = $ldap->getNextGroupGid('LDAP_KEY_MEMBERS_TYPE');

-					}

-

-					$result=$ldap->add($dn,$info,$user);

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-		elseif ($action == 'MEMBER_TYPE_MODIFY')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					if (empty($object->oldcopy) || ! is_object($object->oldcopy))

-					{

-						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

-						$object->oldcopy = clone $object;

-					}

-

-					$object->oldcopy->listMembersForMemberType('', 1);

-

-					$oldinfo=$object->oldcopy->_load_ldap_info();

-					$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

-

-					// Verify if entry exist

-					$container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

-					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

-					$records=$ldap->search($container,$search);

-					if (count($records) && $records['count'] == 0)

-					{

-						$olddn = '';

-					}

-

-					$object->listMembersForMemberType('', 1);

-

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					$result=$ldap->update($dn,$info,$user,$olddn);

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-		elseif ($action == 'MEMBER_TYPE_DELETE')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					$result=$ldap->delete($dn);

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-

-		return $result;

-	}

+                            $membertype=new AdherentType($this->db);

+                            $membertype->fetch($object->typeid);

+                            $membertype->listMembersForMemberType('a.rowid != ' . $object->id, 1); // remove deleted member from the list

+

+                            $oldinfo=$membertype->_load_ldap_info();

+                            $olddn=$membertype->_load_ldap_dn($oldinfo);

+

+                            // Verify if entry exist

+                            $container=$membertype->_load_ldap_dn($oldinfo,1);

+                            $search = "(".$membertype->_load_ldap_dn($oldinfo,2).")";

+                            $records=$ldap->search($container,$search);

+                            if (count($records) && $records['count'] == 0)

+                            {

+                                $olddn = '';

+                            }

+

+                            $info=$membertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

+                            $dn=$membertype->_load_ldap_dn($info);

+

+                            $result=$ldap->update($dn,$info,$user,$olddn);

+                        }

+                    }

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+

+        // Members types

+        elseif ($action == 'MEMBER_TYPE_CREATE')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    // Get a gid number for objectclass PosixGroup

+                    if (in_array('posixGroup',$info['objectclass'])) {

+                        $info['gidNumber'] = $ldap->getNextGroupGid('LDAP_KEY_MEMBERS_TYPE');

+                    }

+

+                    $result=$ldap->add($dn,$info,$user);

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+        elseif ($action == 'MEMBER_TYPE_MODIFY')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    if (empty($object->oldcopy) || ! is_object($object->oldcopy))

+                    {

+                        dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

+                        $object->oldcopy = clone $object;

+                    }

+

+                    $object->oldcopy->listMembersForMemberType('', 1);

+

+                    $oldinfo=$object->oldcopy->_load_ldap_info();

+                    $olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

+

+                    // Verify if entry exist

+                    $container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

+                    $search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

+                    $records=$ldap->search($container,$search);

+                    if (count($records) && $records['count'] == 0)

+                    {

+                        $olddn = '';

+                    }

+

+                    $object->listMembersForMemberType('', 1);

+

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    $result=$ldap->update($dn,$info,$user,$olddn);

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+        elseif ($action == 'MEMBER_TYPE_DELETE')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    $result=$ldap->delete($dn);

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+

+        return $result;

+    }

 }

Spacing +258 added lines, -258 removed lines

@@ -58,10 +58,10 @@ 
 	 */

 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)

 	{

-		if (empty($conf->ldap->enabled)) return 0;		// Module not active, we do nothing

-		if (defined('DISABLE_LDAP_SYNCHRO')) return 0;	// If constant defined, we do nothing

+		if (empty($conf->ldap->enabled)) return 0; // Module not active, we do nothing

+		if (defined('DISABLE_LDAP_SYNCHRO')) return 0; // If constant defined, we do nothing

 

-		if (! function_exists('ldap_connect'))

+		if (!function_exists('ldap_connect'))

 		{

 			dol_syslog("Warning, module LDAP is enabled but LDAP functions not available in this PHP", LOG_WARNING);

 			return 0;

@@ -70,102 +70,102 @@ 
 		require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php";

 		require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php";

 

-		$result=0;

+		$result = 0;

 

 		// Users

 		if ($action == 'USER_CREATE')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

 			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

+				$ldap = new Ldap();

+				$result = $ldap->connect_bind();

 

 				if ($result > 0)

 				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

+					$info = $object->_load_ldap_info();

+					$dn = $object->_load_ldap_dn($info);

 

-					$result=$ldap->add($dn,$info,$user);

+					$result = $ldap->add($dn, $info, $user);

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;

 			}

 		}

 		elseif ($action == 'USER_MODIFY')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

 			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

+				$ldap = new Ldap();

+				$result = $ldap->connect_bind();

 

 				if ($result > 0)

 				{

-					if (empty($object->oldcopy) || ! is_object($object->oldcopy))

+					if (empty($object->oldcopy) || !is_object($object->oldcopy))

 					{

 						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

 						$object->oldcopy = clone $object;

 					}

 

-					$oldinfo=$object->oldcopy->_load_ldap_info();

-					$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

+					$oldinfo = $object->oldcopy->_load_ldap_info();

+					$olddn = $object->oldcopy->_load_ldap_dn($oldinfo);

 

 					// Verify if entry exist

-					$container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

-					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

-					$records=$ldap->search($container,$search);

+					$container = $object->oldcopy->_load_ldap_dn($oldinfo, 1);

+					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo, 2).")";

+					$records = $ldap->search($container, $search);

 					if (count($records) && $records['count'] == 0)

 					{

 						$olddn = '';

 					}

 

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-					$newrdn=$object->_load_ldap_dn($info,2);

-					$newparent=$object->_load_ldap_dn($info,1);

+					$info = $object->_load_ldap_info();

+					$dn = $object->_load_ldap_dn($info);

+					$newrdn = $object->_load_ldap_dn($info, 2);

+					$newparent = $object->_load_ldap_dn($info, 1);

 

-					$result=$ldap->update($dn,$info,$user,$olddn,$newrdn,$newparent);

+					$result = $ldap->update($dn, $info, $user, $olddn, $newrdn, $newparent);

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;

 			}

 		}

 		elseif ($action == 'USER_NEW_PASSWORD')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

 			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

+				$ldap = new Ldap();

+				$result = $ldap->connect_bind();

 

 				if ($result > 0)

 				{

-					if (empty($object->oldcopy) || ! is_object($object->oldcopy))

+					if (empty($object->oldcopy) || !is_object($object->oldcopy))

 					{

 						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

 						$object->oldcopy = clone $object;

 					}

 

-					$oldinfo=$object->oldcopy->_load_ldap_info();

-					$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

+					$oldinfo = $object->oldcopy->_load_ldap_info();

+					$olddn = $object->oldcopy->_load_ldap_dn($oldinfo);

 

 					// Verify if entry exist

-					$container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

-					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

-					$records=$ldap->search($container,$search);

+					$container = $object->oldcopy->_load_ldap_dn($oldinfo, 1);

+					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo, 2).")";

+					$records = $ldap->search($container, $search);

 					if (count($records) && $records['count'] == 0)

 					{

 						$olddn = '';

 					}

 

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

+					$info = $object->_load_ldap_info();

+					$dn = $object->_load_ldap_dn($info);

 

-					$result=$ldap->update($dn,$info,$user,$olddn);

+					$result = $ldap->update($dn, $info, $user, $olddn);

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;

 			}

 		}

 		elseif ($action == 'USER_ENABLEDISABLE')

@@ -175,96 +175,96 @@ 
 		elseif ($action == 'USER_DELETE')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

 			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

+				$ldap = new Ldap();

+				$result = $ldap->connect_bind();

 

 				if ($result > 0)

 				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

+					$info = $object->_load_ldap_info();

+					$dn = $object->_load_ldap_dn($info);

 

-					$result=$ldap->delete($dn);

+					$result = $ldap->delete($dn);

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;

 			}

 		}

 		elseif ($action == 'USER_SETINGROUP')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

 			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

+				$ldap = new Ldap();

+				$result = $ldap->connect_bind();

 

 				if ($result > 0)

 				{

 					// Must edit $object->newgroupid

-					$usergroup=new UserGroup($this->db);

+					$usergroup = new UserGroup($this->db);

 					if ($object->newgroupid > 0)

 					{

 						$usergroup->fetch($object->newgroupid);

 

-						$oldinfo=$usergroup->_load_ldap_info();

-						$olddn=$usergroup->_load_ldap_dn($oldinfo);

+						$oldinfo = $usergroup->_load_ldap_info();

+						$olddn = $usergroup->_load_ldap_dn($oldinfo);

 

 						// Verify if entry exist

-						$container=$usergroup->_load_ldap_dn($oldinfo,1);

-						$search = "(".$usergroup->_load_ldap_dn($oldinfo,2).")";

-						$records=$ldap->search($container,$search);

+						$container = $usergroup->_load_ldap_dn($oldinfo, 1);

+						$search = "(".$usergroup->_load_ldap_dn($oldinfo, 2).")";

+						$records = $ldap->search($container, $search);

 						if (count($records) && $records['count'] == 0)

 						{

 							$olddn = '';

 						}

 

-						$info=$usergroup->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

-						$dn=$usergroup->_load_ldap_dn($info);

+						$info = $usergroup->_load_ldap_info(); // Contains all members, included the new one (insert already done before trigger call)

+						$dn = $usergroup->_load_ldap_dn($info);

 

-						$result=$ldap->update($dn,$info,$user,$olddn);

+						$result = $ldap->update($dn, $info, $user, $olddn);

 					}

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;

 			}

 		}

 		elseif ($action == 'USER_REMOVEFROMGROUP')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

 			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

+				$ldap = new Ldap();

+				$result = $ldap->connect_bind();

 

 				if ($result > 0)

 				{

 					// Must edit $object->newgroupid

-					$usergroup=new UserGroup($this->db);

+					$usergroup = new UserGroup($this->db);

 					if ($object->oldgroupid > 0)

 					{

 						$usergroup->fetch($object->oldgroupid);

 

-						$oldinfo=$usergroup->_load_ldap_info();

-						$olddn=$usergroup->_load_ldap_dn($oldinfo);

+						$oldinfo = $usergroup->_load_ldap_info();

+						$olddn = $usergroup->_load_ldap_dn($oldinfo);

 

 						// Verify if entry exist

-						$container=$usergroup->_load_ldap_dn($oldinfo,1);

-						$search = "(".$usergroup->_load_ldap_dn($oldinfo,2).")";

-						$records=$ldap->search($container,$search);

+						$container = $usergroup->_load_ldap_dn($oldinfo, 1);

+						$search = "(".$usergroup->_load_ldap_dn($oldinfo, 2).")";

+						$records = $ldap->search($container, $search);

 						if (count($records) && $records['count'] == 0)

 						{

 							$olddn = '';

 						}

 

-						$info=$usergroup->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

-						$dn=$usergroup->_load_ldap_dn($info);

+						$info = $usergroup->_load_ldap_info(); // Contains all members, included the new one (insert already done before trigger call)

+						$dn = $usergroup->_load_ldap_dn($info);

 

-						$result=$ldap->update($dn,$info,$user,$olddn);

+						$result = $ldap->update($dn, $info, $user, $olddn);

 					}

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;

 			}

 		}

 

@@ -272,81 +272,81 @@ 
 		elseif ($action == 'GROUP_CREATE')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

 			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

+				$ldap = new Ldap();

+				$result = $ldap->connect_bind();

 

 				if ($result > 0)

 				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

+					$info = $object->_load_ldap_info();

+					$dn = $object->_load_ldap_dn($info);

 

 					// Get a gid number for objectclass PosixGroup

-					if (in_array('posixGroup',$info['objectclass'])) {

+					if (in_array('posixGroup', $info['objectclass'])) {

 						$info['gidNumber'] = $ldap->getNextGroupGid('LDAP_KEY_GROUPS');

 					}

 

-					$result=$ldap->add($dn,$info,$user);

+					$result = $ldap->add($dn, $info, $user);

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;

 			}

 		}

 		elseif ($action == 'GROUP_MODIFY')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

 			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

+				$ldap = new Ldap();

+				$result = $ldap->connect_bind();

 

 				if ($result > 0)

 				{

-					if (empty($object->oldcopy) || ! is_object($object->oldcopy))

+					if (empty($object->oldcopy) || !is_object($object->oldcopy))

 					{

 						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

 						$object->oldcopy = clone $object;

 					}

 

-					$oldinfo=$object->oldcopy->_load_ldap_info();

-					$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

+					$oldinfo = $object->oldcopy->_load_ldap_info();

+					$olddn = $object->oldcopy->_load_ldap_dn($oldinfo);

 

 					// Verify if entry exist

-					$container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

-					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

-					$records=$ldap->search($container,$search);

+					$container = $object->oldcopy->_load_ldap_dn($oldinfo, 1);

+					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo, 2).")";

+					$records = $ldap->search($container, $search);

 					if (count($records) && $records['count'] == 0)

 					{

 						$olddn = '';

 					}

 

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

+					$info = $object->_load_ldap_info();

+					$dn = $object->_load_ldap_dn($info);

 

-					$result=$ldap->update($dn,$info,$user,$olddn);

+					$result = $ldap->update($dn, $info, $user, $olddn);

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;

 			}

 		}

 		elseif ($action == 'GROUP_DELETE')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

 			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

+				$ldap = new Ldap();

+				$result = $ldap->connect_bind();

 

 				if ($result > 0)

 				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

+					$info = $object->_load_ldap_info();

+					$dn = $object->_load_ldap_dn($info);

 

-					$result=$ldap->delete($dn);

+					$result = $ldap->delete($dn);

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;

 			}

 		}

 

@@ -354,76 +354,76 @@ 
 		elseif ($action == 'CONTACT_CREATE')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_CONTACT_ACTIVE))

+			if (!empty($conf->global->LDAP_CONTACT_ACTIVE))

 			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

+				$ldap = new Ldap();

+				$result = $ldap->connect_bind();

 

 				if ($result > 0)

 				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

+					$info = $object->_load_ldap_info();

+					$dn = $object->_load_ldap_dn($info);

 

-					$result=$ldap->add($dn,$info,$user);

+					$result = $ldap->add($dn, $info, $user);

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;

 			}

 		}

 		elseif ($action == 'CONTACT_MODIFY')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_CONTACT_ACTIVE))

+			if (!empty($conf->global->LDAP_CONTACT_ACTIVE))

 			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

+				$ldap = new Ldap();

+				$result = $ldap->connect_bind();

 

 				if ($result > 0)

 				{

-					if (empty($object->oldcopy) || ! is_object($object->oldcopy))

+					if (empty($object->oldcopy) || !is_object($object->oldcopy))

 					{

 						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

 						$object->oldcopy = clone $object;

 					}

 

-					$oldinfo=$object->oldcopy->_load_ldap_info();

-					$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

+					$oldinfo = $object->oldcopy->_load_ldap_info();

+					$olddn = $object->oldcopy->_load_ldap_dn($oldinfo);

 

 					// Verify if entry exist

-					$container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

-					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

-					$records=$ldap->search($container,$search);

+					$container = $object->oldcopy->_load_ldap_dn($oldinfo, 1);

+					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo, 2).")";

+					$records = $ldap->search($container, $search);

 					if (count($records) && $records['count'] == 0)

 					{

 						$olddn = '';

 					}

 

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

+					$info = $object->_load_ldap_info();

+					$dn = $object->_load_ldap_dn($info);

 

-					$result=$ldap->update($dn,$info,$user,$olddn);

+					$result = $ldap->update($dn, $info, $user, $olddn);

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;

 			}

 		}

 		elseif ($action == 'CONTACT_DELETE')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_CONTACT_ACTIVE))

+			if (!empty($conf->global->LDAP_CONTACT_ACTIVE))

 			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

+				$ldap = new Ldap();

+				$result = $ldap->connect_bind();

 

 				if ($result > 0)

 				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

+					$info = $object->_load_ldap_info();

+					$dn = $object->_load_ldap_dn($info);

 

-					$result=$ldap->delete($dn);

+					$result = $ldap->delete($dn);

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;

 			}

 		}

 

@@ -431,78 +431,78 @@ 
 		elseif ($action == 'MEMBER_CREATE')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

+			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

 			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

+				$ldap = new Ldap();

+				$result = $ldap->connect_bind();

 

 				if ($result > 0)

 				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

+					$info = $object->_load_ldap_info();

+					$dn = $object->_load_ldap_dn($info);

 

-					$result=$ldap->add($dn,$info,$user);

+					$result = $ldap->add($dn, $info, $user);

 

 					// For member type

-					if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

+					if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

 					{

-						$membertype=new AdherentType($this->db);

+						$membertype = new AdherentType($this->db);

 						if ($object->typeid > 0)

 						{

 							$membertype->fetch($object->typeid);

 							$membertype->listMembersForMemberType('', 1);

 

-							$oldinfo=$membertype->_load_ldap_info();

-							$olddn=$membertype->_load_ldap_dn($oldinfo);

+							$oldinfo = $membertype->_load_ldap_info();

+							$olddn = $membertype->_load_ldap_dn($oldinfo);

 

 							// Verify if entry exist

-							$container=$membertype->_load_ldap_dn($oldinfo,1);

-							$search = "(".$membertype->_load_ldap_dn($oldinfo,2).")";

-							$records=$ldap->search($container,$search);

+							$container = $membertype->_load_ldap_dn($oldinfo, 1);

+							$search = "(".$membertype->_load_ldap_dn($oldinfo, 2).")";

+							$records = $ldap->search($container, $search);

 							if (count($records) && $records['count'] == 0)

 							{

 								$olddn = '';

 							}

 

-							$info=$membertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

-							$dn=$membertype->_load_ldap_dn($info);

+							$info = $membertype->_load_ldap_info(); // Contains all members, included the new one (insert already done before trigger call)

+							$dn = $membertype->_load_ldap_dn($info);

 

-							$result=$ldap->update($dn,$info,$user,$olddn);

+							$result = $ldap->update($dn, $info, $user, $olddn);

 						}

 					}

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;

 			}

 		}

 		elseif ($action == 'MEMBER_VALIDATE')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

+			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

 			{

 				// If status field is setup to be synchronized

-				if (! empty($conf->global->LDAP_FIELD_MEMBER_STATUS))

+				if (!empty($conf->global->LDAP_FIELD_MEMBER_STATUS))

 				{

-					$ldap=new Ldap();

-					$result=$ldap->connect_bind();

+					$ldap = new Ldap();

+					$result = $ldap->connect_bind();

 

 					if ($result > 0)

 					{

-						$info=$object->_load_ldap_info();

-						$dn=$object->_load_ldap_dn($info);

-						$olddn=$dn;	// We know olddn=dn as we change only status

+						$info = $object->_load_ldap_info();

+						$dn = $object->_load_ldap_dn($info);

+						$olddn = $dn; // We know olddn=dn as we change only status

 

-						$result=$ldap->update($dn,$info,$user,$olddn);

+						$result = $ldap->update($dn, $info, $user, $olddn);

 					}

 

-					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+					if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;

 				}

 			}

 		}

 		elseif ($action == 'MEMBER_SUBSCRIPTION')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

+			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

 			{

 				// If subscriptions fields are setup to be synchronized

 				if ($conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE

@@ -511,212 +511,212 @@ 
 					|| $conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT

 					|| $conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION)

 				{

-					$ldap=new Ldap();

-					$result=$ldap->connect_bind();

+					$ldap = new Ldap();

+					$result = $ldap->connect_bind();

 

 					if ($result > 0)

 					{

-						$info=$object->_load_ldap_info();

-						$dn=$object->_load_ldap_dn($info);

-						$olddn=$dn;	// We know olddn=dn as we change only subscriptions

+						$info = $object->_load_ldap_info();

+						$dn = $object->_load_ldap_dn($info);

+						$olddn = $dn; // We know olddn=dn as we change only subscriptions

 

-						$result=$ldap->update($dn,$info,$user,$olddn);

+						$result = $ldap->update($dn, $info, $user, $olddn);

 					}

 

-					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+					if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;

 				}

 			}

 		}

 		elseif ($action == 'MEMBER_MODIFY')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

+			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

 			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

+				$ldap = new Ldap();

+				$result = $ldap->connect_bind();

 

 				if ($result > 0)

 				{

-					if (empty($object->oldcopy) || ! is_object($object->oldcopy))

+					if (empty($object->oldcopy) || !is_object($object->oldcopy))

 					{

 						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

 						$object->oldcopy = clone $object;

 					}

 

-					$oldinfo=$object->oldcopy->_load_ldap_info();

-					$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

+					$oldinfo = $object->oldcopy->_load_ldap_info();

+					$olddn = $object->oldcopy->_load_ldap_dn($oldinfo);

 

 					// Verify if entry exist

-					$container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

-					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

-					$records=$ldap->search($container,$search);

+					$container = $object->oldcopy->_load_ldap_dn($oldinfo, 1);

+					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo, 2).")";

+					$records = $ldap->search($container, $search);

 					if (count($records) && $records['count'] == 0)

 					{

 						$olddn = '';

 					}

 

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-					$newrdn=$object->_load_ldap_dn($info,2);

-					$newparent=$object->_load_ldap_dn($info,1);

+					$info = $object->_load_ldap_info();

+					$dn = $object->_load_ldap_dn($info);

+					$newrdn = $object->_load_ldap_dn($info, 2);

+					$newparent = $object->_load_ldap_dn($info, 1);

 

-					$result=$ldap->update($dn,$info,$user,$olddn,$newrdn,$newparent);

+					$result = $ldap->update($dn, $info, $user, $olddn, $newrdn, $newparent);

 

 					// For member type

-					if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

+					if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

 					{

 						/*

 						 * Change member info

 						 */

-						$newmembertype=new AdherentType($this->db);

+						$newmembertype = new AdherentType($this->db);

 						$newmembertype->fetch($object->typeid);

 						$newmembertype->listMembersForMemberType('', 1);

 

-						$oldinfo=$newmembertype->_load_ldap_info();

-						$olddn=$newmembertype->_load_ldap_dn($oldinfo);

+						$oldinfo = $newmembertype->_load_ldap_info();

+						$olddn = $newmembertype->_load_ldap_dn($oldinfo);

 

 						// Verify if entry exist

-						$container=$newmembertype->_load_ldap_dn($oldinfo,1);

-						$search = "(".$newmembertype->_load_ldap_dn($oldinfo,2).")";

-						$records=$ldap->search($container,$search);

+						$container = $newmembertype->_load_ldap_dn($oldinfo, 1);

+						$search = "(".$newmembertype->_load_ldap_dn($oldinfo, 2).")";

+						$records = $ldap->search($container, $search);

 						if (count($records) && $records['count'] == 0)

 						{

 							$olddn = '';

 						}

 

-						$info=$newmembertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

-						$dn=$newmembertype->_load_ldap_dn($info);

+						$info = $newmembertype->_load_ldap_info(); // Contains all members, included the new one (insert already done before trigger call)

+						$dn = $newmembertype->_load_ldap_dn($info);

 

-						$result=$ldap->update($dn,$info,$user,$olddn);

+						$result = $ldap->update($dn, $info, $user, $olddn);

 

 						if ($object->oldcopy->typeid != $object->typeid)

 						{

 							/*

 							 * Remove member in old member type

 							 */

-							$oldmembertype=new AdherentType($this->db);

+							$oldmembertype = new AdherentType($this->db);

 							$oldmembertype->fetch($object->oldcopy->typeid);

 							$oldmembertype->listMembersForMemberType('', 1);

 

-							$oldinfo=$oldmembertype->_load_ldap_info();

-							$olddn=$oldmembertype->_load_ldap_dn($oldinfo);

+							$oldinfo = $oldmembertype->_load_ldap_info();

+							$olddn = $oldmembertype->_load_ldap_dn($oldinfo);

 

 							// Verify if entry exist

-							$container=$oldmembertype->_load_ldap_dn($oldinfo,1);

-							$search = "(".$oldmembertype->_load_ldap_dn($oldinfo,2).")";

-							$records=$ldap->search($container,$search);

+							$container = $oldmembertype->_load_ldap_dn($oldinfo, 1);

+							$search = "(".$oldmembertype->_load_ldap_dn($oldinfo, 2).")";

+							$records = $ldap->search($container, $search);

 							if (count($records) && $records['count'] == 0)

 							{

 								$olddn = '';

 							}

 

-							$info=$oldmembertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

-							$dn=$oldmembertype->_load_ldap_dn($info);

+							$info = $oldmembertype->_load_ldap_info(); // Contains all members, included the new one (insert already done before trigger call)

+							$dn = $oldmembertype->_load_ldap_dn($info);

 

-							$result=$ldap->update($dn,$info,$user,$olddn);

+							$result = $ldap->update($dn, $info, $user, $olddn);

 						}

 					}

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;

 			}

 		}

 		elseif ($action == 'MEMBER_NEW_PASSWORD')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

+			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

 			{

 				// If password field is setup to be synchronized

 				if ($conf->global->LDAP_FIELD_PASSWORD || $conf->global->LDAP_FIELD_PASSWORD_CRYPTED)

 				{

-					$ldap=new Ldap();

-					$result=$ldap->connect_bind();

+					$ldap = new Ldap();

+					$result = $ldap->connect_bind();

 

 					if ($result > 0)

 					{

-						$info=$object->_load_ldap_info();

-						$dn=$object->_load_ldap_dn($info);

-						$olddn=$dn;	// We know olddn=dn as we change only password

+						$info = $object->_load_ldap_info();

+						$dn = $object->_load_ldap_dn($info);

+						$olddn = $dn; // We know olddn=dn as we change only password

 

-						$result=$ldap->update($dn,$info,$user,$olddn);

+						$result = $ldap->update($dn, $info, $user, $olddn);

 					}

 

-					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+					if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;

 				}

 			}

 		}

 		elseif ($action == 'MEMBER_RESILIATE')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

+			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

 			{

 				// If status field is setup to be synchronized

-				if (! empty($conf->global->LDAP_FIELD_MEMBER_STATUS))

+				if (!empty($conf->global->LDAP_FIELD_MEMBER_STATUS))

 				{

-					$ldap=new Ldap();

-					$result=$ldap->connect_bind();

+					$ldap = new Ldap();

+					$result = $ldap->connect_bind();

 

 					if ($result > 0)

 					{

-						$info=$object->_load_ldap_info();

-						$dn=$object->_load_ldap_dn($info);

-						$olddn=$dn;	// We know olddn=dn as we change only status

+						$info = $object->_load_ldap_info();

+						$dn = $object->_load_ldap_dn($info);

+						$olddn = $dn; // We know olddn=dn as we change only status

 

-						$result=$ldap->update($dn,$info,$user,$olddn);

+						$result = $ldap->update($dn, $info, $user, $olddn);

 					}

 

-					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+					if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;

 				}

 			}

 		}

 		elseif ($action == 'MEMBER_DELETE')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

+			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

 			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

+				$ldap = new Ldap();

+				$result = $ldap->connect_bind();

 

 				if ($result > 0)

 				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

+					$info = $object->_load_ldap_info();

+					$dn = $object->_load_ldap_dn($info);

 

-					$result=$ldap->delete($dn);

+					$result = $ldap->delete($dn);

 

 					// For member type

-					if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

+					if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

 					{

 						if ($object->typeid > 0)

 						{

 							/*

 							 * Remove member in member type

 							 */

-							$membertype=new AdherentType($this->db);

+							$membertype = new AdherentType($this->db);

 							$membertype->fetch($object->typeid);

-							$membertype->listMembersForMemberType('a.rowid != ' . $object->id, 1); // remove deleted member from the list

+							$membertype->listMembersForMemberType('a.rowid != '.$object->id, 1); // remove deleted member from the list

 

-							$oldinfo=$membertype->_load_ldap_info();

-							$olddn=$membertype->_load_ldap_dn($oldinfo);

+							$oldinfo = $membertype->_load_ldap_info();

+							$olddn = $membertype->_load_ldap_dn($oldinfo);

 

 							// Verify if entry exist

-							$container=$membertype->_load_ldap_dn($oldinfo,1);

-							$search = "(".$membertype->_load_ldap_dn($oldinfo,2).")";

-							$records=$ldap->search($container,$search);

+							$container = $membertype->_load_ldap_dn($oldinfo, 1);

+							$search = "(".$membertype->_load_ldap_dn($oldinfo, 2).")";

+							$records = $ldap->search($container, $search);

 							if (count($records) && $records['count'] == 0)

 							{

 								$olddn = '';

 							}

 

-							$info=$membertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

-							$dn=$membertype->_load_ldap_dn($info);

+							$info = $membertype->_load_ldap_info(); // Contains all members, included the new one (insert already done before trigger call)

+							$dn = $membertype->_load_ldap_dn($info);

 

-							$result=$ldap->update($dn,$info,$user,$olddn);

+							$result = $ldap->update($dn, $info, $user, $olddn);

 						}

 					}

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;

 			}

 		}

 

@@ -724,38 +724,38 @@ 
 		elseif ($action == 'MEMBER_TYPE_CREATE')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

+			if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

 			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

+				$ldap = new Ldap();

+				$result = $ldap->connect_bind();

 

 				if ($result > 0)

 				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

+					$info = $object->_load_ldap_info();

+					$dn = $object->_load_ldap_dn($info);

 

 					// Get a gid number for objectclass PosixGroup

-					if (in_array('posixGroup',$info['objectclass'])) {

+					if (in_array('posixGroup', $info['objectclass'])) {

 						$info['gidNumber'] = $ldap->getNextGroupGid('LDAP_KEY_MEMBERS_TYPE');

 					}

 

-					$result=$ldap->add($dn,$info,$user);

+					$result = $ldap->add($dn, $info, $user);

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;

 			}

 		}

 		elseif ($action == 'MEMBER_TYPE_MODIFY')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

+			if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

 			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

+				$ldap = new Ldap();

+				$result = $ldap->connect_bind();

 

 				if ($result > 0)

 				{

-					if (empty($object->oldcopy) || ! is_object($object->oldcopy))

+					if (empty($object->oldcopy) || !is_object($object->oldcopy))

 					{

 						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

 						$object->oldcopy = clone $object;

@@ -763,13 +763,13 @@ 
 

 					$object->oldcopy->listMembersForMemberType('', 1);

 

-					$oldinfo=$object->oldcopy->_load_ldap_info();

-					$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

+					$oldinfo = $object->oldcopy->_load_ldap_info();

+					$olddn = $object->oldcopy->_load_ldap_dn($oldinfo);

 

 					// Verify if entry exist

-					$container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

-					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

-					$records=$ldap->search($container,$search);

+					$container = $object->oldcopy->_load_ldap_dn($oldinfo, 1);

+					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo, 2).")";

+					$records = $ldap->search($container, $search);

 					if (count($records) && $records['count'] == 0)

 					{

 						$olddn = '';

@@ -777,32 +777,32 @@ 
 

 					$object->listMembersForMemberType('', 1);

 

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

+					$info = $object->_load_ldap_info();

+					$dn = $object->_load_ldap_dn($info);

 

-					$result=$ldap->update($dn,$info,$user,$olddn);

+					$result = $ldap->update($dn, $info, $user, $olddn);

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;

 			}

 		}

 		elseif ($action == 'MEMBER_TYPE_DELETE')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

+			if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

 			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

+				$ldap = new Ldap();

+				$result = $ldap->connect_bind();

 

 				if ($result > 0)

 				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

+					$info = $object->_load_ldap_info();

+					$dn = $object->_load_ldap_dn($info);

 

-					$result=$ldap->delete($dn);

+					$result = $ldap->delete($dn);

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;

 			}

 		}

 

Braces +92 added lines, -60 removed lines

@@ -58,8 +58,14 @@ 
 	 */

 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)

 	{

-		if (empty($conf->ldap->enabled)) return 0;		// Module not active, we do nothing

-		if (defined('DISABLE_LDAP_SYNCHRO')) return 0;	// If constant defined, we do nothing

+		if (empty($conf->ldap->enabled)) {
+		    return 0;
+		}
+		// Module not active, we do nothing

+		if (defined('DISABLE_LDAP_SYNCHRO')) {
+		    return 0;
+		}
+		// If constant defined, we do nothing

 

 		if (! function_exists('ldap_connect'))

 		{

@@ -89,10 +95,11 @@ 
 					$result=$ldap->add($dn,$info,$user);

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}

-		}

-		elseif ($action == 'USER_MODIFY')

+		} elseif ($action == 'USER_MODIFY')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

 			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

@@ -128,10 +135,11 @@ 
 					$result=$ldap->update($dn,$info,$user,$olddn,$newrdn,$newparent);

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}

-		}

-		elseif ($action == 'USER_NEW_PASSWORD')

+		} elseif ($action == 'USER_NEW_PASSWORD')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

 			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

@@ -165,14 +173,14 @@ 
 					$result=$ldap->update($dn,$info,$user,$olddn);

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}

-		}

-		elseif ($action == 'USER_ENABLEDISABLE')

+		} elseif ($action == 'USER_ENABLEDISABLE')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-		}

-		elseif ($action == 'USER_DELETE')

+		} elseif ($action == 'USER_DELETE')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

 			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

@@ -188,10 +196,11 @@ 
 					$result=$ldap->delete($dn);

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}

-		}

-		elseif ($action == 'USER_SETINGROUP')

+		} elseif ($action == 'USER_SETINGROUP')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

 			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

@@ -226,10 +235,11 @@ 
 					}

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}

-		}

-		elseif ($action == 'USER_REMOVEFROMGROUP')

+		} elseif ($action == 'USER_REMOVEFROMGROUP')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

 			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

@@ -264,7 +274,9 @@ 
 					}

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}

 		}

 

@@ -290,10 +302,11 @@ 
 					$result=$ldap->add($dn,$info,$user);

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}

-		}

-		elseif ($action == 'GROUP_MODIFY')

+		} elseif ($action == 'GROUP_MODIFY')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

 			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

@@ -327,10 +340,11 @@ 
 					$result=$ldap->update($dn,$info,$user,$olddn);

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}

-		}

-		elseif ($action == 'GROUP_DELETE')

+		} elseif ($action == 'GROUP_DELETE')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

 			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

@@ -346,7 +360,9 @@ 
 					$result=$ldap->delete($dn);

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}

 		}

 

@@ -367,10 +383,11 @@ 
 					$result=$ldap->add($dn,$info,$user);

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}

-		}

-		elseif ($action == 'CONTACT_MODIFY')

+		} elseif ($action == 'CONTACT_MODIFY')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

 			if (! empty($conf->global->LDAP_CONTACT_ACTIVE))

@@ -404,10 +421,11 @@ 
 					$result=$ldap->update($dn,$info,$user,$olddn);

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}

-		}

-		elseif ($action == 'CONTACT_DELETE')

+		} elseif ($action == 'CONTACT_DELETE')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

 			if (! empty($conf->global->LDAP_CONTACT_ACTIVE))

@@ -423,7 +441,9 @@ 
 					$result=$ldap->delete($dn);

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}

 		}

 

@@ -472,10 +492,11 @@ 
 					}

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}

-		}

-		elseif ($action == 'MEMBER_VALIDATE')

+		} elseif ($action == 'MEMBER_VALIDATE')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

 			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

@@ -495,11 +516,12 @@ 
 						$result=$ldap->update($dn,$info,$user,$olddn);

 					}

 

-					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+					if ($result < 0) {
+					    $this->error="ErrorLDAP ".$ldap->error;
+					}
 				}

 			}

-		}

-		elseif ($action == 'MEMBER_SUBSCRIPTION')

+		} elseif ($action == 'MEMBER_SUBSCRIPTION')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

 			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

@@ -523,11 +545,12 @@ 
 						$result=$ldap->update($dn,$info,$user,$olddn);

 					}

 

-					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+					if ($result < 0) {
+					    $this->error="ErrorLDAP ".$ldap->error;
+					}
 				}

 			}

-		}

-		elseif ($action == 'MEMBER_MODIFY')

+		} elseif ($action == 'MEMBER_MODIFY')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

 			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

@@ -618,10 +641,11 @@ 
 					}

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}

-		}

-		elseif ($action == 'MEMBER_NEW_PASSWORD')

+		} elseif ($action == 'MEMBER_NEW_PASSWORD')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

 			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

@@ -641,11 +665,12 @@ 
 						$result=$ldap->update($dn,$info,$user,$olddn);

 					}

 

-					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+					if ($result < 0) {
+					    $this->error="ErrorLDAP ".$ldap->error;
+					}
 				}

 			}

-		}

-		elseif ($action == 'MEMBER_RESILIATE')

+		} elseif ($action == 'MEMBER_RESILIATE')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

 			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

@@ -665,11 +690,12 @@ 
 						$result=$ldap->update($dn,$info,$user,$olddn);

 					}

 

-					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+					if ($result < 0) {
+					    $this->error="ErrorLDAP ".$ldap->error;
+					}
 				}

 			}

-		}

-		elseif ($action == 'MEMBER_DELETE')

+		} elseif ($action == 'MEMBER_DELETE')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

 			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

@@ -716,7 +742,9 @@ 
 					}

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}

 		}

 

@@ -742,10 +770,11 @@ 
 					$result=$ldap->add($dn,$info,$user);

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}

-		}

-		elseif ($action == 'MEMBER_TYPE_MODIFY')

+		} elseif ($action == 'MEMBER_TYPE_MODIFY')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

 			if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

@@ -783,10 +812,11 @@ 
 					$result=$ldap->update($dn,$info,$user,$olddn);

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}

-		}

-		elseif ($action == 'MEMBER_TYPE_DELETE')

+		} elseif ($action == 'MEMBER_TYPE_DELETE')

 		{

 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

 			if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

@@ -802,7 +832,9 @@ 
 					$result=$ldap->delete($dn);

 				}

 

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}

 		}