alxarafe / alixar

Helpers/DolUtils.php

Indentation +92 added lines, -92 removed lines

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

     static function dol_shutdown()

     {

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

+        // global Globals::$conf, $user, Globals::$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, Globals::$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, Globals::$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, Globals::$langs, $hookmanager;

+        // global Globals::$conf, Globals::$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, Globals::$langs;

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

 

         $error = 0;

 

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

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

     {

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

+        // global Globals::$conf, Globals::$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, Globals::$langs;

+        // global Globals::$conf, Globals::$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, Globals::$langs;

+        // global Globals::$conf, Globals::$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, Globals::$langs;

+        // global Globals::$conf, Globals::$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 Globals::$langs;

+        // global Globals::$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, Globals::$langs, $hookmanager;

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

 

         $newemail = $email;

 

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

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

     {

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

+        // global Globals::$conf, $user, Globals::$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, Globals::$langs, $mysoc, $hookmanager;

+        // global Globals::$conf, $user, Globals::$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, Globals::$langs;

+        // global Globals::$conf, Globals::$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, Globals::$langs, $user;

+        // global Globals::$conf, Globals::$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, Globals::$langs, $hookmanager;

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

 

         $out = '';

 

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

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

     {

-       // global Globals::$langs;

+        // global Globals::$langs;

 

         if (empty($stringencoding))

             $stringencoding = Globals::$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, Globals::$langs;

+        // global Globals::$conf, Globals::$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, Globals::$langs;

+        // global Globals::$conf, Globals::$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, Globals::$langs;

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

 

         if ($titlealt == 'default')

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

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

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

     {

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

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

 

         if ($titlealt == 'default')

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

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

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

     {

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

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

 

         if ($titlealt == 'default')

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

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

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

     {

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

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

 

         if ($titlealt == 'default')

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

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

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

     {

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

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

 

         if ($titlealt == 'default')

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

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

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

     {

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

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

 

         if ($titlealt == 'default')

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

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

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

     {

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

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

         if ($titlealt == "default")

             $titlealt = Globals::$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, Globals::$langs;

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

 

         if ($titlealt == 'default')

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

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

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

     {

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

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

 

         if ($usealttitle) {

             if (is_string($usealttitle))

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

     static function img_info($titlealt = 'default')

     {

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

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

 

         if ($titlealt == 'default')

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

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

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

     {

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

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

 

         if ($titlealt == 'default')

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

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

     static function img_error($titlealt = 'default')

     {

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

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

 

         if ($titlealt == 'default')

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

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

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

     {

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

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

 

         if ($titlealt == 'default')

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

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

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

     {

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

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

 

         if ($titlealt == 'default')

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

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

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

     {

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

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

 

         if ($titlealt == 'default')

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

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

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

     {

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

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

 

         if ($titlealt == 'default')

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

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

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

     {

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

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

 

         if ($titlealt == 'default')

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

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

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

     {

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

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

 

         if ($titlealt == 'default')

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

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

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

     {

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

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

 

         if ($titlealt == 'default')

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

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

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

     {

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

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

 

         if ($titlealt == 'default')

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

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

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

     {

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

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

 

         if ($titlealt == 'default')

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

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

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

     {

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

+        // global Globals::$conf, Globals::$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, Globals::$langs, $argv;

+        // global Globals::$conf, Globals::$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 Globals::$langs, Globals::$conf;

+        // global Globals::$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, Globals::$langs, $form;

+        // global Globals::$conf, Globals::$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, Globals::$langs;

+        // global Globals::$conf, Globals::$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, Globals::$langs;

+        // global Globals::$conf, Globals::$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 Globals::$langs, Globals::$conf;

+        // global Globals::$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 Globals::$langs, Globals::$conf;

+        // global Globals::$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;

 

         DolUtils::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;

 

         DolUtils::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 Globals::$langs;

+        // global Globals::$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;

 

         DolUtils::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, Globals::$langs;

+        // global Globals::$conf, Globals::$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 Globals::$langs;

+        // global Globals::$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, Globals::$langs;

+        // global Globals::$conf, Globals::$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, Globals::$langs;

+        // global $user, Globals::$conf, Globals::$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 Globals::$langs;

+        // global Globals::$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, Globals::$langs;

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

 

         $value = trim($value);

 

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

     static function showDirectDownloadLink($object)

     {

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

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

 

         $out = '';

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

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

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

     {

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

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

 

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

             return '';

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

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

     {

-       // global Globals::$langs;

+        // global Globals::$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, Globals::$langs;

+        // global $dictvalues, $db, Globals::$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']))