';
if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is useless due to the global search combo
{
print '
\n"; } @@ -118,6 +119,7 @@ if ($resql) } $db->free($resql); + print '
"; } else { diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index 6c5fb4701dd..79e7c11001c 100644 --- a/htdocs/commande/index.php +++ b/htdocs/commande/index.php @@ -3,6 +3,7 @@ * Copyright (C) 2004-2011 Laurent Destailleur
* Copyright (C) 2005-2012 Regis Houssin
* Copyright (C) 2019 Nicolas ZABOURI
+ * Copyright (C) 2019 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -74,11 +75,12 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele
$var=false;
print '
\n"; } @@ -123,6 +125,7 @@ if ($resql) $i++; } $db->free($resql); + print '
"; } else { @@ -190,6 +193,7 @@ if (! empty($conf->commande->enabled)) $resql=$db->query($sql); if ($resql) { + print '
"; } } @@ -259,6 +263,7 @@ $sql.= $db->plimit($max, 0); $resql=$db->query($sql); if ($resql) { + print '
"; } else dol_print_error($db); @@ -339,7 +344,7 @@ if (! empty($conf->commande->enabled)) if ($resql) { $num = $db->num_rows($resql); - + print '
"; } else dol_print_error($db); } @@ -421,6 +426,7 @@ if (! empty($conf->commande->enabled)) { $num = $db->num_rows($resql); + print '
"; } else dol_print_error($db); } diff --git a/htdocs/core/actions_builddoc.inc.php b/htdocs/core/actions_builddoc.inc.php index 391d4df5cb5..ce582040ac9 100644 --- a/htdocs/core/actions_builddoc.inc.php +++ b/htdocs/core/actions_builddoc.inc.php @@ -29,14 +29,14 @@ // $upload_dir must be defined (example $conf->projet->dir_output . "/";) // $hidedetails, $hidedesc, $hideref and $moreparams may have been set or not. -if (!empty($permissioncreate) && empty($permissiontoadd)) $permissiontoadd = $permissioncreate; // For backward compatibility +if (!empty($permissioncreate) && empty($permissiontoadd)) $permissiontoadd = $permissioncreate; // For backward compatibility // Build doc if ($action == 'builddoc' && $permissiontoadd) { if (is_numeric(GETPOST('model', 'alpha'))) { - $error=$langs->trans("ErrorFieldRequired", $langs->transnoentities("Model")); + $error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Model")); } else { @@ -61,34 +61,34 @@ if ($action == 'builddoc' && $permissiontoadd) if (GETPOST('fk_bank', 'int')) { // this field may come from an external module $object->fk_bank = GETPOST('fk_bank', 'int'); - } elseif (! empty($object->fk_account)) { + } elseif (!empty($object->fk_account)) { $object->fk_bank = $object->fk_account; } //} $outputlangs = $langs; - $newlang=''; + $newlang = ''; - if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang=GETPOST('lang_id', 'aZ09'); - if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->thirdparty->default_lang)) $newlang=$object->thirdparty->default_lang; // for proposal, order, invoice, ... - if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) $newlang=$object->default_lang; // for thirdparty - if (! empty($newlang)) + if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09'); + if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->thirdparty->default_lang)) $newlang = $object->thirdparty->default_lang; // for proposal, order, invoice, ... + if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) $newlang = $object->default_lang; // for thirdparty + if (!empty($newlang)) { $outputlangs = new Translate("", $conf); $outputlangs->setDefaultLang($newlang); } // To be sure vars is defined - if (empty($hidedetails)) $hidedetails=0; - if (empty($hidedesc)) $hidedesc=0; - if (empty($hideref)) $hideref=0; - if (empty($moreparams)) $moreparams=null; + if (empty($hidedetails)) $hidedetails = 0; + if (empty($hidedesc)) $hidedesc = 0; + if (empty($hideref)) $hideref = 0; + if (empty($moreparams)) $moreparams = null; - $result= $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams); + $result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams); if ($result <= 0) { setEventMessages($object->error, $object->errors, 'errors'); - $action=''; + $action = ''; } else { @@ -98,7 +98,7 @@ if ($action == 'builddoc' && $permissiontoadd) $urltoredirect = $_SERVER['REQUEST_URI']; $urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect); - $urltoredirect = preg_replace('/action=builddoc&?/', '', $urltoredirect); // To avoid infinite loop + $urltoredirect = preg_replace('/action=builddoc&?/', '', $urltoredirect); // To avoid infinite loop header('Location: '.$urltoredirect.'#builddoc'); exit; @@ -110,10 +110,10 @@ if ($action == 'builddoc' && $permissiontoadd) // Delete file in doc form if ($action == 'remove_file' && $permissiontoadd) { - if (! empty($upload_dir)) { + if (!empty($upload_dir)) { require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - if (empty($object->id) || ! $object->id > 0) + if (empty($object->id) || !$object->id > 0) { // Reload to get all modified line records and be ready for hooks $ret = $object->fetch($id); @@ -121,9 +121,9 @@ if ($action == 'remove_file' && $permissiontoadd) } $langs->load("other"); - $filetodelete=GETPOST('file', 'alpha'); - $file = $upload_dir . '/' . $filetodelete; - $ret=dol_delete_file($file, 0, 0, 0, $object); + $filetodelete = GETPOST('file', 'alpha'); + $file = $upload_dir.'/'.$filetodelete; + $ret = dol_delete_file($file, 0, 0, 0, $object); if ($ret) setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs'); else setEventMessages($langs->trans("ErrorFailToDeleteFile", $filetodelete), null, 'errors'); diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 54a2c5825b4..e0a30c271a2 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -37,7 +37,7 @@ * This file contains all frequently used functions. */ -include_once DOL_DOCUMENT_ROOT .'/core/lib/json.lib.php'; +include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php'; /** @@ -53,10 +53,10 @@ include_once DOL_DOCUMENT_ROOT .'/core/lib/json.lib.php'; */ function getDoliDBInstance($type, $host, $user, $pass, $name, $port) { - require_once DOL_DOCUMENT_ROOT ."/core/db/".$type.'.class.php'; + require_once DOL_DOCUMENT_ROOT."/core/db/".$type.'.class.php'; - $class='DoliDB'.ucfirst($type); - $dolidb=new $class($type, $host, $user, $pass, $name, $port); + $class = 'DoliDB'.ucfirst($type); + $dolidb = new $class($type, $host, $user, $pass, $name, $port); return $dolidb; } @@ -87,10 +87,10 @@ function getEntity($element, $shared = 1, $currentobject = null) } else { - $out=''; + $out = ''; $addzero = array('user', 'usergroup', 'c_email_templates', 'email_template', 'default_values'); - if (in_array($element, $addzero)) $out.= '0,'; - $out.= $conf->entity; + if (in_array($element, $addzero)) $out .= '0,'; + $out .= $conf->entity; return $out; } } @@ -135,9 +135,9 @@ function getBrowserInfo($user_agent) { include_once DOL_DOCUMENT_ROOT.'/includes/mobiledetect/mobiledetectlib/Mobile_Detect.php'; - $name='unknown'; - $version=''; - $os='unknown'; + $name = 'unknown'; + $version = ''; + $os = 'unknown'; $phone = ''; $detectmobile = new Mobile_Detect(null, $user_agent); @@ -168,22 +168,22 @@ function getBrowserInfo($user_agent) } // OS - if (preg_match('/linux/i', $user_agent)) { $os='linux'; } - elseif (preg_match('/macintosh/i', $user_agent)) { $os='macintosh'; } - elseif (preg_match('/windows/i', $user_agent)) { $os='windows'; } + if (preg_match('/linux/i', $user_agent)) { $os = 'linux'; } + elseif (preg_match('/macintosh/i', $user_agent)) { $os = 'macintosh'; } + elseif (preg_match('/windows/i', $user_agent)) { $os = 'windows'; } // Name - if (preg_match('/firefox(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name='firefox'; $version=$reg[2]; } - elseif (preg_match('/edge(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name='edge'; $version=$reg[2]; } - elseif (preg_match('/chrome(\/|\s)([\d\.]+)/i', $user_agent, $reg)) { $name='chrome'; $version=$reg[2]; } // we can have 'chrome (Mozilla...) chrome x.y' in one string - elseif (preg_match('/chrome/i', $user_agent, $reg)) { $name='chrome'; } - elseif (preg_match('/iceweasel/i', $user_agent)) { $name='iceweasel'; } - elseif (preg_match('/epiphany/i', $user_agent)) { $name='epiphany'; } - elseif (preg_match('/safari(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name='safari'; $version=$reg[2]; } // Safari is often present in string for mobile but its not. - elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name='opera'; $version=$reg[2]; } - elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) { $name='ie'; $version=end($reg); } // MS products at end - elseif (preg_match('/(Windows NT\s([0-9]+\.[0-9])).*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) { $name='ie'; $version=end($reg); } // MS products at end - elseif (preg_match('/l(i|y)n(x|ks)(\(|\/|\s)*([\d\.]+)/i', $user_agent, $reg)) { $name='lynxlinks'; $version=$reg[4]; } + if (preg_match('/firefox(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'firefox'; $version = $reg[2]; } + elseif (preg_match('/edge(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'edge'; $version = $reg[2]; } + elseif (preg_match('/chrome(\/|\s)([\d\.]+)/i', $user_agent, $reg)) { $name = 'chrome'; $version = $reg[2]; } // we can have 'chrome (Mozilla...) chrome x.y' in one string + elseif (preg_match('/chrome/i', $user_agent, $reg)) { $name = 'chrome'; } + elseif (preg_match('/iceweasel/i', $user_agent)) { $name = 'iceweasel'; } + elseif (preg_match('/epiphany/i', $user_agent)) { $name = 'epiphany'; } + elseif (preg_match('/safari(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'safari'; $version = $reg[2]; } // Safari is often present in string for mobile but its not. + elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'opera'; $version = $reg[2]; } + elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) { $name = 'ie'; $version = end($reg); } // MS products at end + elseif (preg_match('/(Windows NT\s([0-9]+\.[0-9])).*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) { $name = 'ie'; $version = end($reg); } // MS products at end + elseif (preg_match('/l(i|y)n(x|ks)(\(|\/|\s)*([\d\.]+)/i', $user_agent, $reg)) { $name = 'lynxlinks'; $version = $reg[4]; } if ($tablet) { $layout = 'tablet'; @@ -210,10 +210,10 @@ function getBrowserInfo($user_agent) */ function dol_shutdown() { - global $conf,$user,$langs,$db; - $disconnectdone=false; $depth=0; - if (is_object($db) && ! empty($db->connected)) { $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)); + global $conf, $user, $langs, $db; + $disconnectdone = false; $depth = 0; + if (is_object($db) && !empty($db->connected)) { $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)); } /** @@ -253,7 +253,7 @@ function GETPOSTISSET($paramname) */ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $options = null, $noreplace = 0) { - global $mysoc,$user,$conf; + global $mysoc, $user, $conf; if (empty($paramname)) return 'BadFirstParameterForGETPOST'; if (empty($check)) @@ -263,10 +263,10 @@ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $opti //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]:''); + 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] : ''); else return 'BadThirdParameterForGETPOST'; if (empty($method) || $method == 3 || $method == 4) @@ -281,41 +281,41 @@ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $opti // Code for search criteria persistence. // Retrieve values if restore_lastsearch_values - if (! empty($_GET['restore_lastsearch_values'])) // Use $_GET here and not GETPOST + if (!empty($_GET['restore_lastsearch_values'])) // Use $_GET here and not GETPOST { - if (! empty($_SESSION['lastsearch_values_'.$relativepathstring])) // If there is saved values + if (!empty($_SESSION['lastsearch_values_'.$relativepathstring])) // If there is saved values { - $tmp=json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true); + $tmp = json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true); if (is_array($tmp)) { - foreach($tmp as $key => $val) + foreach ($tmp as $key => $val) { if ($key == $paramname) // We are on the requested parameter { - $out=$val; + $out = $val; break; } } } } // If there is saved contextpage, page or limit - if ($paramname == 'contextpage' && ! empty($_SESSION['lastsearch_contextpage_'.$relativepathstring])) + if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_'.$relativepathstring])) { $out = $_SESSION['lastsearch_contextpage_'.$relativepathstring]; } - elseif ($paramname == 'page' && ! empty($_SESSION['lastsearch_page_'.$relativepathstring])) + elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring])) { $out = $_SESSION['lastsearch_page_'.$relativepathstring]; } - elseif ($paramname == 'limit' && ! empty($_SESSION['lastsearch_limit_'.$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 - 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 + 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])) + if (!empty($_GET['action']) && $_GET['action'] == 'create' && !isset($_GET[$paramname]) && !isset($_POST[$paramname])) { // Search default value from $object->field global $object; @@ -324,28 +324,28 @@ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $opti $out = $object->fields[$paramname]['default']; } } - if (! empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES)) + if (!empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES)) { - if (! empty($_GET['action']) && (preg_match('/^create/', $_GET['action']) || preg_match('/^presend/', $_GET['action'])) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname])) + if (!empty($_GET['action']) && (preg_match('/^create/', $_GET['action']) || preg_match('/^presend/', $_GET['action'])) && !isset($_GET[$paramname]) && !isset($_POST[$paramname])) { // Now search in setup to overwrite default values - if (! empty($user->default_values)) // $user->default_values defined from menu 'Setup - Default values' + if (!empty($user->default_values)) // $user->default_values defined from menu 'Setup - Default values' { if (isset($user->default_values[$relativepathstring]['createform'])) { - foreach($user->default_values[$relativepathstring]['createform'] as $defkey => $defval) + foreach ($user->default_values[$relativepathstring]['createform'] as $defkey => $defval) { $qualified = 0; if ($defkey != '_noquery_') { - $tmpqueryarraytohave=explode('&', $defkey); - $tmpqueryarraywehave=explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING'])); - $foundintru=0; - foreach($tmpqueryarraytohave as $tmpquerytohave) + $tmpqueryarraytohave = explode('&', $defkey); + $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; @@ -365,45 +365,45 @@ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $opti } // Management of default search_filters and sort order //elseif (preg_match('/list.php$/', $_SERVER["PHP_SELF"]) && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname])) - elseif (! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname])) + elseif (!empty($paramname) && !isset($_GET[$paramname]) && !isset($_POST[$paramname])) { - if (! empty($user->default_values)) // $user->default_values defined from menu 'Setup - Default values' + if (!empty($user->default_values)) // $user->default_values defined from menu 'Setup - Default values' { //var_dump($user->default_values[$relativepathstring]); if ($paramname == 'sortfield' || $paramname == 'sortorder') // Sorted on which fields ? ASC or DESC ? { if (isset($user->default_values[$relativepathstring]['sortorder'])) // Even if paramname is sortfield, data are stored into ['sortorder...'] { - foreach($user->default_values[$relativepathstring]['sortorder'] as $defkey => $defval) + foreach ($user->default_values[$relativepathstring]['sortorder'] as $defkey => $defval) { $qualified = 0; if ($defkey != '_noquery_') { - $tmpqueryarraytohave=explode('&', $defkey); - $tmpqueryarraywehave=explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING'])); - $foundintru=0; - foreach($tmpqueryarraytohave as $tmpquerytohave) + $tmpqueryarraytohave = explode('&', $defkey); + $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; if ($qualified) { - $forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","="); // we accept _, -, . and , - foreach($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val) + $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); + $out .= dol_string_nospecial($key, '', $forbidden_chars_to_replace); } if ($paramname == 'sortorder') { - $out.=dol_string_nospecial($val, '', $forbidden_chars_to_replace); + $out .= dol_string_nospecial($val, '', $forbidden_chars_to_replace); } } //break; // No break for sortfield and sortorder so we can cumulate fields (is it realy usefull ?) @@ -413,19 +413,19 @@ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $opti } elseif (isset($user->default_values[$relativepathstring]['filters'])) { - foreach($user->default_values[$relativepathstring]['filters'] as $defkey => $defval) // $defkey is a querystring like 'a=b&c=d', $defval is key of user + foreach ($user->default_values[$relativepathstring]['filters'] as $defkey => $defval) // $defkey is a querystring like 'a=b&c=d', $defval is key of user { $qualified = 0; if ($defkey != '_noquery_') { - $tmpqueryarraytohave=explode('&', $defkey); - $tmpqueryarraywehave=explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING'])); - $foundintru=0; - foreach($tmpqueryarraytohave as $tmpquerytohave) + $tmpqueryarraytohave = explode('&', $defkey); + $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; @@ -437,13 +437,13 @@ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $opti // We made a search from quick search menu, do we still use default filter ? if (empty($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; @@ -459,22 +459,22 @@ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $opti // Substitution variables for GETPOST (used to get final url with variable parameters or final default value with variable parameters) // Example of variables: __DAY__, __MONTH__, __YEAR__, __MYCOMPANY_COUNTRY_ID__, __USER_ID__, ... // 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)) + if (!is_array($out) && empty($_POST[$paramname]) && empty($noreplace)) { - $maxloop=20; $loopnb=0; // Protection against infinite loop + $maxloop = 20; $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 = ''; - if ($reg[1] == 'DAY') { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mday']; } - elseif ($reg[1] == 'MONTH') { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mon']; } - elseif ($reg[1] == 'YEAR') { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['year']; } - elseif ($reg[1] == 'PREVIOUS_DAY') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; } - elseif ($reg[1] == 'PREVIOUS_MONTH') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_prev_month($tmp['mon'], $tmp['year']); $newout = $tmp2['month']; } - elseif ($reg[1] == 'PREVIOUS_YEAR') { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] - 1); } - elseif ($reg[1] == 'NEXT_DAY') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; } - elseif ($reg[1] == 'NEXT_MONTH') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_month($tmp['mon'], $tmp['year']); $newout = $tmp2['month']; } - elseif ($reg[1] == 'NEXT_YEAR') { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] + 1); } + if ($reg[1] == 'DAY') { $tmp = dol_getdate(dol_now(), true); $newout = $tmp['mday']; } + elseif ($reg[1] == 'MONTH') { $tmp = dol_getdate(dol_now(), true); $newout = $tmp['mon']; } + elseif ($reg[1] == 'YEAR') { $tmp = dol_getdate(dol_now(), true); $newout = $tmp['year']; } + elseif ($reg[1] == 'PREVIOUS_DAY') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; } + elseif ($reg[1] == 'PREVIOUS_MONTH') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_prev_month($tmp['mon'], $tmp['year']); $newout = $tmp2['month']; } + elseif ($reg[1] == 'PREVIOUS_YEAR') { $tmp = dol_getdate(dol_now(), true); $newout = ($tmp['year'] - 1); } + elseif ($reg[1] == 'NEXT_DAY') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; } + elseif ($reg[1] == 'NEXT_MONTH') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_next_month($tmp['mon'], $tmp['year']); $newout = $tmp2['month']; } + elseif ($reg[1] == 'NEXT_YEAR') { $tmp = dol_getdate(dol_now(), true); $newout = ($tmp['year'] + 1); } elseif ($reg[1] == 'MYCOMPANY_COUNTRY_ID' || $reg[1] == 'MYCOUNTRY_ID' || $reg[1] == 'MYCOUNTRYID') { $newout = $mysoc->country_id; @@ -491,7 +491,7 @@ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $opti { $newout = $conf->entity; } - else $newout = ''; // Key not found, we replace with empty string + else $newout = ''; // Key not found, we replace with empty string //var_dump('__'.$reg[1].'__ -> '.$newout); $out = preg_replace('/__'.preg_quote($reg[1], '/').'__/', $newout, $out); } @@ -503,68 +503,68 @@ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $opti case 'none': break; case 'int': // Check param is a numeric value (integer but also float or hexadecimal) - if (! is_numeric($out)) { $out=''; } + if (!is_numeric($out)) { $out = ''; } 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)) + if (!is_array($out)) { - $out=trim($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=''; - elseif (preg_match('/\.\.\//', $out)) $out=''; + if (preg_match('/"/', $out)) $out = ''; + elseif (preg_match('/\.\.\//', $out)) $out = ''; } break; case 'san_alpha': - $out=filter_var($out, FILTER_SANITIZE_STRING); + $out = filter_var($out, FILTER_SANITIZE_STRING); break; case 'aZ': - if (! is_array($out)) + if (!is_array($out)) { - $out=trim($out); - if (preg_match('/[^a-z]+/i', $out)) $out=''; + $out = trim($out); + if (preg_match('/[^a-z]+/i', $out)) $out = ''; } break; case 'aZ09': - if (! is_array($out)) + if (!is_array($out)) { - $out=trim($out); - if (preg_match('/[^a-z0-9_\-\.]+/i', $out)) $out=''; + $out = trim($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)) + if (!is_array($out)) { - $out=trim($out); - if (preg_match('/[^a-z0-9_\-\.,]+/i', $out)) $out=''; + $out = trim($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); + $out = dol_string_nohtmltag($out, 0); break; case 'alphanohtml': // Recommended for search parameters - if (! is_array($out)) + if (!is_array($out)) { - $out=trim($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=''; - elseif (preg_match('/\.\.\//', $out)) $out=''; - $out=dol_string_nohtmltag($out); + if (preg_match('/"/', $out)) $out = ''; + elseif (preg_match('/\.\.\//', $out)) $out = ''; + $out = dol_string_nohtmltag($out); } break; case 'restricthtml': // Recommended for most html textarea - $out=dol_string_onlythesehtmltags($out, 0); + $out = dol_string_onlythesehtmltags($out, 0); break; case 'custom': if (empty($filter)) return 'BadFourthParameterForGETPOST'; - $out=filter_var($out, $filter, $options); + $out = filter_var($out, $filter, $options); break; } @@ -572,7 +572,7 @@ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $opti // Save data into session if key start with 'search_' or is 'smonth', 'syear', 'month', 'year' if (empty($method) || $method == 3 || $method == 4) { - if (preg_match('/^search_/', $paramname) || in_array($paramname, array('sortorder','sortfield'))) + if (preg_match('/^search_/', $paramname) || in_array($paramname, array('sortorder', 'sortfield'))) { //var_dump($paramname.' - '.$out.' '.$user->default_values[$relativepathstring]['filters'][$paramname]); @@ -582,7 +582,7 @@ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $opti if ($out != '') // $out = '0' or 'abc', it is a search criteria to keep { - $user->lastsearch_values_tmp[$relativepathstring][$paramname]=$out; + $user->lastsearch_values_tmp[$relativepathstring][$paramname] = $out; } } } @@ -591,7 +591,7 @@ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $opti } -if (! function_exists('dol_getprefix')) +if (!function_exists('dol_getprefix')) { /** * Return a prefix to use for this Dolibarr instance, for session/cookie names or email id. @@ -608,21 +608,21 @@ if (! function_exists('dol_getprefix')) // If prefix is for email if ($mode == 'email') { - if (! empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID)) // If MAIL_PREFIX_FOR_EMAIL_ID is set (a value initialized with a random value is recommended) + if (!empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID)) // If MAIL_PREFIX_FOR_EMAIL_ID is set (a value initialized with a random value is recommended) { if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID; elseif (isset($_SERVER["SERVER_NAME"])) return $_SERVER["SERVER_NAME"]; } // The recommended value (may be not defined for old versions) - if (! empty($conf->file->instance_unique_id)) return $conf->file->instance_unique_id; + if (!empty($conf->file->instance_unique_id)) return $conf->file->instance_unique_id; // For backward compatibility return dol_hash(DOL_DOCUMENT_ROOT.DOL_URL_ROOT, '3'); } // The recommended value (may be not defined for old versions) - if (! empty($conf->file->instance_unique_id)) return $conf->file->instance_unique_id; + if (!empty($conf->file->instance_unique_id)) return $conf->file->instance_unique_id; // For backward compatibility if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"])) @@ -646,7 +646,7 @@ if (! function_exists('dol_getprefix')) */ function dol_include_once($relpath, $classname = '') { - global $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 $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); @@ -655,7 +655,7 @@ function dol_include_once($relpath, $classname = '') return false; } - if (! empty($classname) && ! class_exists($classname)) { + if (!empty($classname) && !class_exists($classname)) { return include $fullpath; } else { return include_once $fullpath; @@ -677,11 +677,11 @@ function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0) { global $conf; - $path=preg_replace('/^\//', '', $path); + $path = preg_replace('/^\//', '', $path); if (empty($type)) // For a filesystem path { - $res = DOL_DOCUMENT_ROOT.'/'.$path; // Standard default path + $res = DOL_DOCUMENT_ROOT.'/'.$path; // Standard default path if (is_array($conf->file->dol_document_root)) { foreach ($conf->file->dol_document_root as $key => $dirroot) // ex: array("main"=>"/home/main/htdocs", "alt0"=>"/home/dirmod/htdocs", ...) @@ -692,14 +692,14 @@ function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0) } if (file_exists($dirroot.'/'.$path)) { - $res=$dirroot.'/'.$path; + $res = $dirroot.'/'.$path; return $res; } } } 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 @@ -708,9 +708,9 @@ function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0) // 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 // using proxy, rewriting, virtual path, etc... - $res=''; - if ($type == 1) $res = DOL_URL_ROOT.'/'.$path; // Standard value - if ($type == 2) $res = DOL_MAIN_URL_ROOT.'/'.$path; // Standard value + $res = ''; + if ($type == 1) $res = DOL_URL_ROOT.'/'.$path; // Standard value + if ($type == 2) $res = DOL_MAIN_URL_ROOT.'/'.$path; // Standard value if ($type == 3) $res = DOL_URL_ROOT.'/'.$path; foreach ($conf->file->dol_document_root as $key => $dirroot) // ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...) @@ -722,38 +722,38 @@ function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0) global $dolibarr_main_url_root; // Define $urlwithroot - $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root)); - $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file + $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root)); + $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // 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', $conf->file->dol_url_root[$key])?'':$urlwithroot).'/'.$path; // Test on start with http is for old conf syntax + $res = (preg_match('/^http/i', $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 '?' - if (! empty($regs[1])) + 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].'
'."\n"; if (file_exists($dirroot.'/'.$regs[1])) { if ($type == 1) { - $res=(preg_match('/^http/i', $conf->file->dol_url_root[$key])?'':DOL_URL_ROOT).$conf->file->dol_url_root[$key].'/'.$path; + $res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : DOL_URL_ROOT).$conf->file->dol_url_root[$key].'/'.$path; } if ($type == 2) { - $res=(preg_match('/^http/i', $conf->file->dol_url_root[$key])?'':DOL_MAIN_URL_ROOT).$conf->file->dol_url_root[$key].'/'.$path; + $res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : DOL_MAIN_URL_ROOT).$conf->file->dol_url_root[$key].'/'.$path; } if ($type == 3) { global $dolibarr_main_url_root; // Define $urlwithroot - $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root)); - $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file + $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root)); + $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // 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', $conf->file->dol_url_root[$key])?'':$urlwithroot).$conf->file->dol_url_root[$key].'/'.$path; // Test on start with http is for old conf syntax + $res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : $urlwithroot).$conf->file->dol_url_root[$key].'/'.$path; // Test on start with http is for old conf syntax } break; } @@ -778,11 +778,11 @@ function dol_clone($object, $native = 0) { if (empty($native)) { - $myclone=unserialize(serialize($object)); + $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; @@ -822,7 +822,7 @@ function dol_sanitizeFileName($str, $newstr = '_', $unaccent = 1) // Char '>' '<' '|' '$' and ';' are special chars for shells. // Char '/' and '\' are file delimiters. $filesystem_forbidden_chars = array('<', '>', '/', '\\', '?', '*', '|', '"', ':', '°', '$', ';'); - return dol_string_nospecial($unaccent?dol_string_unaccent($str):$str, $newstr, $filesystem_forbidden_chars); + return dol_string_nospecial($unaccent ?dol_string_unaccent($str) : $str, $newstr, $filesystem_forbidden_chars); } /** @@ -837,8 +837,8 @@ function dol_sanitizeFileName($str, $newstr = '_', $unaccent = 1) */ function dol_sanitizePathName($str, $newstr = '_', $unaccent = 1) { - $filesystem_forbidden_chars = array('<','>','?','*','|','"','°'); - return dol_string_nospecial($unaccent?dol_string_unaccent($str):$str, $newstr, $filesystem_forbidden_chars); + $filesystem_forbidden_chars = array('<', '>', '?', '*', '|', '"', '°'); + return dol_string_nospecial($unaccent ?dol_string_unaccent($str) : $str, $newstr, $filesystem_forbidden_chars); } /** @@ -856,21 +856,21 @@ function dol_string_unaccent($str) // See http://www.utf8-chartable.de/ $string = rawurlencode($str); $replacements = array( - '%C3%80' => 'A','%C3%81' => 'A','%C3%82' => 'A','%C3%83' => 'A','%C3%84' => 'A','%C3%85' => 'A', - '%C3%88' => 'E','%C3%89' => 'E','%C3%8A' => 'E','%C3%8B' => 'E', - '%C3%8C' => 'I','%C3%8D' => 'I','%C3%8E' => 'I','%C3%8F' => 'I', - '%C3%92' => 'O','%C3%93' => 'O','%C3%94' => 'O','%C3%95' => 'O','%C3%96' => 'O', - '%C3%99' => 'U','%C3%9A' => 'U','%C3%9B' => 'U','%C3%9C' => 'U', - '%C3%A0' => 'a','%C3%A1' => 'a','%C3%A2' => 'a','%C3%A3' => 'a','%C3%A4' => 'a','%C3%A5' => 'a', + '%C3%80' => 'A', '%C3%81' => 'A', '%C3%82' => 'A', '%C3%83' => 'A', '%C3%84' => 'A', '%C3%85' => 'A', + '%C3%88' => 'E', '%C3%89' => 'E', '%C3%8A' => 'E', '%C3%8B' => 'E', + '%C3%8C' => 'I', '%C3%8D' => 'I', '%C3%8E' => 'I', '%C3%8F' => 'I', + '%C3%92' => 'O', '%C3%93' => 'O', '%C3%94' => 'O', '%C3%95' => 'O', '%C3%96' => 'O', + '%C3%99' => 'U', '%C3%9A' => 'U', '%C3%9B' => 'U', '%C3%9C' => 'U', + '%C3%A0' => 'a', '%C3%A1' => 'a', '%C3%A2' => 'a', '%C3%A3' => 'a', '%C3%A4' => 'a', '%C3%A5' => 'a', '%C3%A7' => 'c', - '%C3%A8' => 'e','%C3%A9' => 'e','%C3%AA' => 'e','%C3%AB' => 'e', - '%C3%AC' => 'i','%C3%AD' => 'i','%C3%AE' => 'i','%C3%AF' => 'i', + '%C3%A8' => 'e', '%C3%A9' => 'e', '%C3%AA' => 'e', '%C3%AB' => 'e', + '%C3%AC' => 'i', '%C3%AD' => 'i', '%C3%AE' => 'i', '%C3%AF' => 'i', '%C3%B1' => 'n', - '%C3%B2' => 'o','%C3%B3' => 'o','%C3%B4' => 'o','%C3%B5' => 'o','%C3%B6' => 'o', - '%C3%B9' => 'u','%C3%BA' => 'u','%C3%BB' => 'u','%C3%BC' => 'u', + '%C3%B2' => 'o', '%C3%B3' => 'o', '%C3%B4' => 'o', '%C3%B5' => 'o', '%C3%B6' => 'o', + '%C3%B9' => 'u', '%C3%BA' => 'u', '%C3%BB' => 'u', '%C3%BC' => 'u', '%C3%BF' => 'y' ); - $string=strtr($string, $replacements); + $string = strtr($string, $replacements); return rawurldecode($string); } else @@ -909,9 +909,9 @@ function dol_string_unaccent($str) */ function dol_string_nospecial($str, $newstr = '_', $badcharstoreplace = '') { - $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_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("(",")"); return str_replace($forbidden_chars_to_replace, $newstr, str_replace($forbidden_chars_to_remove, "", $str)); @@ -929,13 +929,13 @@ function dol_string_nospecial($str, $newstr = '_', $badcharstoreplace = '') function dol_escape_js($stringtoescape, $mode = 0, $noescapebackslashn = 0) { // escape quotes and backslashes, newlines, etc. - $substitjs=array("'"=>"\\'","\r"=>'\\r'); + $substitjs = array("'"=>"\\'", "\r"=>'\\r'); //$substitjs['"=>'',''=>'')); - 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 + $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(""=>'', ''=>'')); + 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 } @@ -1022,28 +1022,28 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename = } } - if (! empty($message)) + if (!empty($message)) { // Test log level $logLevels = array(LOG_EMERG=>'EMERG', LOG_ALERT=>'ALERT', LOG_CRIT=>'CRITICAL', LOG_ERR=>'ERR', LOG_WARNING=>'WARN', LOG_NOTICE=>'NOTICE', LOG_INFO=>'INFO', LOG_DEBUG=>'DEBUG'); - if (! array_key_exists($level, $logLevels)) + if (!array_key_exists($level, $logLevels)) { throw new Exception('Incorrect log level'); } if ($level > $conf->global->SYSLOG_LEVEL) return; - $message = preg_replace('/password=\'[^\']*\'/', 'password=\'hidden\'', $message); // protection to avoid to have value of password in log + $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($conf->global->MAIN_ENABLE_LOG_TO_HTML)) - || (! empty($user->rights->debugbar->read) && is_object($debugbar))) + if ((!empty($_REQUEST['logtohtml']) && !empty($conf->global->MAIN_ENABLE_LOG_TO_HTML)) + || (!empty($user->rights->debugbar->read) && is_object($debugbar))) { $conf->logbuffer[] = dol_print_date(time(), "%Y-%m-%d %H:%M:%S")." ".$logLevels[$level]." ".$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($conf->global->MAIN_ENABLE_LOG_INLINE_HTML) && ! empty($_GET["log"])) + if (!empty($conf->global->MAIN_ENABLE_LOG_INLINE_HTML) && !empty($_GET["log"])) { print "\n\n'; - if ((! empty($title) && $showtitle) || $morehtmlright || ! empty($links)) { - $out.= '
';
+ $nophoto = '/public/theme/common/nophoto.png';
+ $morehtmlleft .= '';
}
}
}
elseif ($object->element == 'ticket')
{
- $width=80; $cssclass='photoref';
- $showimage=$object->is_photo_available($conf->ticket->multidir_output[$entity].'/'.$object->ref);
- $maxvisiblephotos=(isset($conf->global->TICKET_MAX_VISIBLE_PHOTO)?$conf->global->TICKET_MAX_VISIBLE_PHOTO:2);
- if ($conf->browser->layout == 'phone') $maxvisiblephotos=1;
+ $width = 80; $cssclass = 'photoref';
+ $showimage = $object->is_photo_available($conf->ticket->multidir_output[$entity].'/'.$object->ref);
+ $maxvisiblephotos = (isset($conf->global->TICKET_MAX_VISIBLE_PHOTO) ? $conf->global->TICKET_MAX_VISIBLE_PHOTO : 2);
+ if ($conf->browser->layout == 'phone') $maxvisiblephotos = 1;
if ($showimage)
{
$showphoto = $object->show_photos('ticket', $conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0);
if ($object->nbphoto > 0)
{
- $morehtmlleft.='';
+ $nophoto = '/public/theme/common/nophoto.png';
+ $morehtmlleft .= '';
}
}
}
@@ -1409,26 +1409,26 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
{
if ($modulepart != 'unknown')
{
- $phototoshow='';
+ $phototoshow = '';
// 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($conf->$modulepart->multidir_output[$entity]) ? $conf->$modulepart->dir_output : $conf->$modulepart->multidir_output[$entity]) . "/";
+ $dir_output = (empty($conf->$modulepart->multidir_output[$entity]) ? $conf->$modulepart->dir_output : $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
+ if (empty($subdir)) $subdir = 'errorgettingsubdirofobject'; // Protection to avoid to return empty path
- $filepath = $dir_output . $subdir . "/";
+ $filepath = $dir_output.$subdir."/";
- $filepdf = $filepath . $objectref . ".pdf";
+ $filepdf = $filepath.$objectref.".pdf";
$relativepath = $subdir.'/'.$objectref.'.pdf';
// Define path to preview pdf file (preview precompiled "file.ext" are "file.ext_preview.png")
@@ -1441,159 +1441,159 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
if ($pdfexists)
{
// Conversion du PDF en image png si fichier png non existant
- if (! file_exists($fileimage) || (filemtime($fileimage) < filemtime($filepdf)))
+ if (!file_exists($fileimage) || (filemtime($fileimage) < filemtime($filepdf)))
{
if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS)) // If you experience trouble with pdf thumb generation and imagick, you can disable here.
{
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
- $ret = dol_convert_file($filepdf, 'png', $fileimage, '0'); // Convert first page of PDF into a file _preview.png
+ $ret = dol_convert_file($filepdf, 'png', $fileimage, '0'); // Convert first page of PDF into a file _preview.png
if ($ret < 0) $error++;
}
}
}
- if ($pdfexists && ! $error)
+ if ($pdfexists && !$error)
{
- $heightforphotref=70;
- if (! empty($conf->dol_optimize_smallscreen)) $heightforphotref=60;
+ $heightforphotref = 70;
+ if (!empty($conf->dol_optimize_smallscreen)) $heightforphotref = 60;
// If the preview file is found
if (file_exists($fileimage))
{
$phototoshow = '';
+ $phototoshow .= '.')
';
+ $phototoshow .= '
\n"; } @@ -118,6 +119,7 @@ if ($resql) } $db->free($resql); + print '
';
print '';
print '
"; + print "
| '.$langs->trans("Statistics").' - '.$langs->trans("Proposals").' | |
| '.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").') | '.$totalinprocess.' |
| '.$langs->trans("Total").' | '.$total.' |
"; + print "
"; } else { diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index 6c5fb4701dd..79e7c11001c 100644 --- a/htdocs/commande/index.php +++ b/htdocs/commande/index.php @@ -3,6 +3,7 @@ * Copyright (C) 2004-2011 Laurent Destailleur
\n"; } @@ -123,6 +125,7 @@ if ($resql) $i++; } $db->free($resql); + print '
';
print '';
print '
"; + print "
| '.$langs->trans("Statistics").' - '.$langs->trans("CustomersOrders").' | |
|---|---|
| '.$langs->trans("Total").' | '.$total.' |
"; + print "
"; } else { @@ -190,6 +193,7 @@ if (! empty($conf->commande->enabled)) $resql=$db->query($sql); if ($resql) { + print '
';
print '';
print '
"; + print "
| '.$langs->trans("DraftOrders").' | ||
|---|---|---|
| '.$langs->trans("NoOrder").' | ||
"; + print "
"; } } @@ -259,6 +263,7 @@ $sql.= $db->plimit($max, 0); $resql=$db->query($sql); if ($resql) { + print '
';
print '';
print '
"; + print "
| '.$langs->trans("LastModifiedOrders", $max).' |
|---|
"; + print "
"; } else dol_print_error($db); @@ -339,7 +344,7 @@ if (! empty($conf->commande->enabled)) if ($resql) { $num = $db->num_rows($resql); - + print '
';
print '';
print '
"; + print "
| '.$langs->trans("OrdersToProcess").' '.$num.' |
|---|
"; + print "
"; } else dol_print_error($db); } @@ -421,6 +426,7 @@ if (! empty($conf->commande->enabled)) { $num = $db->num_rows($resql); + print '
';
print '';
print '
"; + print "
| '.$langs->trans("OnProcessOrders").' '.$num.' |
|---|
"; + print "
"; } else dol_print_error($db); } diff --git a/htdocs/core/actions_builddoc.inc.php b/htdocs/core/actions_builddoc.inc.php index 391d4df5cb5..ce582040ac9 100644 --- a/htdocs/core/actions_builddoc.inc.php +++ b/htdocs/core/actions_builddoc.inc.php @@ -29,14 +29,14 @@ // $upload_dir must be defined (example $conf->projet->dir_output . "/";) // $hidedetails, $hidedesc, $hideref and $moreparams may have been set or not. -if (!empty($permissioncreate) && empty($permissiontoadd)) $permissiontoadd = $permissioncreate; // For backward compatibility +if (!empty($permissioncreate) && empty($permissiontoadd)) $permissiontoadd = $permissioncreate; // For backward compatibility // Build doc if ($action == 'builddoc' && $permissiontoadd) { if (is_numeric(GETPOST('model', 'alpha'))) { - $error=$langs->trans("ErrorFieldRequired", $langs->transnoentities("Model")); + $error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Model")); } else { @@ -61,34 +61,34 @@ if ($action == 'builddoc' && $permissiontoadd) if (GETPOST('fk_bank', 'int')) { // this field may come from an external module $object->fk_bank = GETPOST('fk_bank', 'int'); - } elseif (! empty($object->fk_account)) { + } elseif (!empty($object->fk_account)) { $object->fk_bank = $object->fk_account; } //} $outputlangs = $langs; - $newlang=''; + $newlang = ''; - if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang=GETPOST('lang_id', 'aZ09'); - if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->thirdparty->default_lang)) $newlang=$object->thirdparty->default_lang; // for proposal, order, invoice, ... - if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) $newlang=$object->default_lang; // for thirdparty - if (! empty($newlang)) + if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09'); + if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->thirdparty->default_lang)) $newlang = $object->thirdparty->default_lang; // for proposal, order, invoice, ... + if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) $newlang = $object->default_lang; // for thirdparty + if (!empty($newlang)) { $outputlangs = new Translate("", $conf); $outputlangs->setDefaultLang($newlang); } // To be sure vars is defined - if (empty($hidedetails)) $hidedetails=0; - if (empty($hidedesc)) $hidedesc=0; - if (empty($hideref)) $hideref=0; - if (empty($moreparams)) $moreparams=null; + if (empty($hidedetails)) $hidedetails = 0; + if (empty($hidedesc)) $hidedesc = 0; + if (empty($hideref)) $hideref = 0; + if (empty($moreparams)) $moreparams = null; - $result= $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams); + $result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams); if ($result <= 0) { setEventMessages($object->error, $object->errors, 'errors'); - $action=''; + $action = ''; } else { @@ -98,7 +98,7 @@ if ($action == 'builddoc' && $permissiontoadd) $urltoredirect = $_SERVER['REQUEST_URI']; $urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect); - $urltoredirect = preg_replace('/action=builddoc&?/', '', $urltoredirect); // To avoid infinite loop + $urltoredirect = preg_replace('/action=builddoc&?/', '', $urltoredirect); // To avoid infinite loop header('Location: '.$urltoredirect.'#builddoc'); exit; @@ -110,10 +110,10 @@ if ($action == 'builddoc' && $permissiontoadd) // Delete file in doc form if ($action == 'remove_file' && $permissiontoadd) { - if (! empty($upload_dir)) { + if (!empty($upload_dir)) { require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - if (empty($object->id) || ! $object->id > 0) + if (empty($object->id) || !$object->id > 0) { // Reload to get all modified line records and be ready for hooks $ret = $object->fetch($id); @@ -121,9 +121,9 @@ if ($action == 'remove_file' && $permissiontoadd) } $langs->load("other"); - $filetodelete=GETPOST('file', 'alpha'); - $file = $upload_dir . '/' . $filetodelete; - $ret=dol_delete_file($file, 0, 0, 0, $object); + $filetodelete = GETPOST('file', 'alpha'); + $file = $upload_dir.'/'.$filetodelete; + $ret = dol_delete_file($file, 0, 0, 0, $object); if ($ret) setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs'); else setEventMessages($langs->trans("ErrorFailToDeleteFile", $filetodelete), null, 'errors'); diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 54a2c5825b4..e0a30c271a2 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -37,7 +37,7 @@ * This file contains all frequently used functions. */ -include_once DOL_DOCUMENT_ROOT .'/core/lib/json.lib.php'; +include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php'; /** @@ -53,10 +53,10 @@ include_once DOL_DOCUMENT_ROOT .'/core/lib/json.lib.php'; */ function getDoliDBInstance($type, $host, $user, $pass, $name, $port) { - require_once DOL_DOCUMENT_ROOT ."/core/db/".$type.'.class.php'; + require_once DOL_DOCUMENT_ROOT."/core/db/".$type.'.class.php'; - $class='DoliDB'.ucfirst($type); - $dolidb=new $class($type, $host, $user, $pass, $name, $port); + $class = 'DoliDB'.ucfirst($type); + $dolidb = new $class($type, $host, $user, $pass, $name, $port); return $dolidb; } @@ -87,10 +87,10 @@ function getEntity($element, $shared = 1, $currentobject = null) } else { - $out=''; + $out = ''; $addzero = array('user', 'usergroup', 'c_email_templates', 'email_template', 'default_values'); - if (in_array($element, $addzero)) $out.= '0,'; - $out.= $conf->entity; + if (in_array($element, $addzero)) $out .= '0,'; + $out .= $conf->entity; return $out; } } @@ -135,9 +135,9 @@ function getBrowserInfo($user_agent) { include_once DOL_DOCUMENT_ROOT.'/includes/mobiledetect/mobiledetectlib/Mobile_Detect.php'; - $name='unknown'; - $version=''; - $os='unknown'; + $name = 'unknown'; + $version = ''; + $os = 'unknown'; $phone = ''; $detectmobile = new Mobile_Detect(null, $user_agent); @@ -168,22 +168,22 @@ function getBrowserInfo($user_agent) } // OS - if (preg_match('/linux/i', $user_agent)) { $os='linux'; } - elseif (preg_match('/macintosh/i', $user_agent)) { $os='macintosh'; } - elseif (preg_match('/windows/i', $user_agent)) { $os='windows'; } + if (preg_match('/linux/i', $user_agent)) { $os = 'linux'; } + elseif (preg_match('/macintosh/i', $user_agent)) { $os = 'macintosh'; } + elseif (preg_match('/windows/i', $user_agent)) { $os = 'windows'; } // Name - if (preg_match('/firefox(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name='firefox'; $version=$reg[2]; } - elseif (preg_match('/edge(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name='edge'; $version=$reg[2]; } - elseif (preg_match('/chrome(\/|\s)([\d\.]+)/i', $user_agent, $reg)) { $name='chrome'; $version=$reg[2]; } // we can have 'chrome (Mozilla...) chrome x.y' in one string - elseif (preg_match('/chrome/i', $user_agent, $reg)) { $name='chrome'; } - elseif (preg_match('/iceweasel/i', $user_agent)) { $name='iceweasel'; } - elseif (preg_match('/epiphany/i', $user_agent)) { $name='epiphany'; } - elseif (preg_match('/safari(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name='safari'; $version=$reg[2]; } // Safari is often present in string for mobile but its not. - elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name='opera'; $version=$reg[2]; } - elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) { $name='ie'; $version=end($reg); } // MS products at end - elseif (preg_match('/(Windows NT\s([0-9]+\.[0-9])).*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) { $name='ie'; $version=end($reg); } // MS products at end - elseif (preg_match('/l(i|y)n(x|ks)(\(|\/|\s)*([\d\.]+)/i', $user_agent, $reg)) { $name='lynxlinks'; $version=$reg[4]; } + if (preg_match('/firefox(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'firefox'; $version = $reg[2]; } + elseif (preg_match('/edge(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'edge'; $version = $reg[2]; } + elseif (preg_match('/chrome(\/|\s)([\d\.]+)/i', $user_agent, $reg)) { $name = 'chrome'; $version = $reg[2]; } // we can have 'chrome (Mozilla...) chrome x.y' in one string + elseif (preg_match('/chrome/i', $user_agent, $reg)) { $name = 'chrome'; } + elseif (preg_match('/iceweasel/i', $user_agent)) { $name = 'iceweasel'; } + elseif (preg_match('/epiphany/i', $user_agent)) { $name = 'epiphany'; } + elseif (preg_match('/safari(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'safari'; $version = $reg[2]; } // Safari is often present in string for mobile but its not. + elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'opera'; $version = $reg[2]; } + elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) { $name = 'ie'; $version = end($reg); } // MS products at end + elseif (preg_match('/(Windows NT\s([0-9]+\.[0-9])).*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) { $name = 'ie'; $version = end($reg); } // MS products at end + elseif (preg_match('/l(i|y)n(x|ks)(\(|\/|\s)*([\d\.]+)/i', $user_agent, $reg)) { $name = 'lynxlinks'; $version = $reg[4]; } if ($tablet) { $layout = 'tablet'; @@ -210,10 +210,10 @@ function getBrowserInfo($user_agent) */ function dol_shutdown() { - global $conf,$user,$langs,$db; - $disconnectdone=false; $depth=0; - if (is_object($db) && ! empty($db->connected)) { $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)); + global $conf, $user, $langs, $db; + $disconnectdone = false; $depth = 0; + if (is_object($db) && !empty($db->connected)) { $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)); } /** @@ -253,7 +253,7 @@ function GETPOSTISSET($paramname) */ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $options = null, $noreplace = 0) { - global $mysoc,$user,$conf; + global $mysoc, $user, $conf; if (empty($paramname)) return 'BadFirstParameterForGETPOST'; if (empty($check)) @@ -263,10 +263,10 @@ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $opti //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]:''); + 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] : ''); else return 'BadThirdParameterForGETPOST'; if (empty($method) || $method == 3 || $method == 4) @@ -281,41 +281,41 @@ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $opti // Code for search criteria persistence. // Retrieve values if restore_lastsearch_values - if (! empty($_GET['restore_lastsearch_values'])) // Use $_GET here and not GETPOST + if (!empty($_GET['restore_lastsearch_values'])) // Use $_GET here and not GETPOST { - if (! empty($_SESSION['lastsearch_values_'.$relativepathstring])) // If there is saved values + if (!empty($_SESSION['lastsearch_values_'.$relativepathstring])) // If there is saved values { - $tmp=json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true); + $tmp = json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true); if (is_array($tmp)) { - foreach($tmp as $key => $val) + foreach ($tmp as $key => $val) { if ($key == $paramname) // We are on the requested parameter { - $out=$val; + $out = $val; break; } } } } // If there is saved contextpage, page or limit - if ($paramname == 'contextpage' && ! empty($_SESSION['lastsearch_contextpage_'.$relativepathstring])) + if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_'.$relativepathstring])) { $out = $_SESSION['lastsearch_contextpage_'.$relativepathstring]; } - elseif ($paramname == 'page' && ! empty($_SESSION['lastsearch_page_'.$relativepathstring])) + elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring])) { $out = $_SESSION['lastsearch_page_'.$relativepathstring]; } - elseif ($paramname == 'limit' && ! empty($_SESSION['lastsearch_limit_'.$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 - 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 + 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])) + if (!empty($_GET['action']) && $_GET['action'] == 'create' && !isset($_GET[$paramname]) && !isset($_POST[$paramname])) { // Search default value from $object->field global $object; @@ -324,28 +324,28 @@ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $opti $out = $object->fields[$paramname]['default']; } } - if (! empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES)) + if (!empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES)) { - if (! empty($_GET['action']) && (preg_match('/^create/', $_GET['action']) || preg_match('/^presend/', $_GET['action'])) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname])) + if (!empty($_GET['action']) && (preg_match('/^create/', $_GET['action']) || preg_match('/^presend/', $_GET['action'])) && !isset($_GET[$paramname]) && !isset($_POST[$paramname])) { // Now search in setup to overwrite default values - if (! empty($user->default_values)) // $user->default_values defined from menu 'Setup - Default values' + if (!empty($user->default_values)) // $user->default_values defined from menu 'Setup - Default values' { if (isset($user->default_values[$relativepathstring]['createform'])) { - foreach($user->default_values[$relativepathstring]['createform'] as $defkey => $defval) + foreach ($user->default_values[$relativepathstring]['createform'] as $defkey => $defval) { $qualified = 0; if ($defkey != '_noquery_') { - $tmpqueryarraytohave=explode('&', $defkey); - $tmpqueryarraywehave=explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING'])); - $foundintru=0; - foreach($tmpqueryarraytohave as $tmpquerytohave) + $tmpqueryarraytohave = explode('&', $defkey); + $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; @@ -365,45 +365,45 @@ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $opti } // Management of default search_filters and sort order //elseif (preg_match('/list.php$/', $_SERVER["PHP_SELF"]) && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname])) - elseif (! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname])) + elseif (!empty($paramname) && !isset($_GET[$paramname]) && !isset($_POST[$paramname])) { - if (! empty($user->default_values)) // $user->default_values defined from menu 'Setup - Default values' + if (!empty($user->default_values)) // $user->default_values defined from menu 'Setup - Default values' { //var_dump($user->default_values[$relativepathstring]); if ($paramname == 'sortfield' || $paramname == 'sortorder') // Sorted on which fields ? ASC or DESC ? { if (isset($user->default_values[$relativepathstring]['sortorder'])) // Even if paramname is sortfield, data are stored into ['sortorder...'] { - foreach($user->default_values[$relativepathstring]['sortorder'] as $defkey => $defval) + foreach ($user->default_values[$relativepathstring]['sortorder'] as $defkey => $defval) { $qualified = 0; if ($defkey != '_noquery_') { - $tmpqueryarraytohave=explode('&', $defkey); - $tmpqueryarraywehave=explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING'])); - $foundintru=0; - foreach($tmpqueryarraytohave as $tmpquerytohave) + $tmpqueryarraytohave = explode('&', $defkey); + $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; if ($qualified) { - $forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","="); // we accept _, -, . and , - foreach($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val) + $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); + $out .= dol_string_nospecial($key, '', $forbidden_chars_to_replace); } if ($paramname == 'sortorder') { - $out.=dol_string_nospecial($val, '', $forbidden_chars_to_replace); + $out .= dol_string_nospecial($val, '', $forbidden_chars_to_replace); } } //break; // No break for sortfield and sortorder so we can cumulate fields (is it realy usefull ?) @@ -413,19 +413,19 @@ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $opti } elseif (isset($user->default_values[$relativepathstring]['filters'])) { - foreach($user->default_values[$relativepathstring]['filters'] as $defkey => $defval) // $defkey is a querystring like 'a=b&c=d', $defval is key of user + foreach ($user->default_values[$relativepathstring]['filters'] as $defkey => $defval) // $defkey is a querystring like 'a=b&c=d', $defval is key of user { $qualified = 0; if ($defkey != '_noquery_') { - $tmpqueryarraytohave=explode('&', $defkey); - $tmpqueryarraywehave=explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING'])); - $foundintru=0; - foreach($tmpqueryarraytohave as $tmpquerytohave) + $tmpqueryarraytohave = explode('&', $defkey); + $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; @@ -437,13 +437,13 @@ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $opti // We made a search from quick search menu, do we still use default filter ? if (empty($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; @@ -459,22 +459,22 @@ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $opti // Substitution variables for GETPOST (used to get final url with variable parameters or final default value with variable parameters) // Example of variables: __DAY__, __MONTH__, __YEAR__, __MYCOMPANY_COUNTRY_ID__, __USER_ID__, ... // 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)) + if (!is_array($out) && empty($_POST[$paramname]) && empty($noreplace)) { - $maxloop=20; $loopnb=0; // Protection against infinite loop + $maxloop = 20; $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 = ''; - if ($reg[1] == 'DAY') { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mday']; } - elseif ($reg[1] == 'MONTH') { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mon']; } - elseif ($reg[1] == 'YEAR') { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['year']; } - elseif ($reg[1] == 'PREVIOUS_DAY') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; } - elseif ($reg[1] == 'PREVIOUS_MONTH') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_prev_month($tmp['mon'], $tmp['year']); $newout = $tmp2['month']; } - elseif ($reg[1] == 'PREVIOUS_YEAR') { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] - 1); } - elseif ($reg[1] == 'NEXT_DAY') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; } - elseif ($reg[1] == 'NEXT_MONTH') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_month($tmp['mon'], $tmp['year']); $newout = $tmp2['month']; } - elseif ($reg[1] == 'NEXT_YEAR') { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] + 1); } + if ($reg[1] == 'DAY') { $tmp = dol_getdate(dol_now(), true); $newout = $tmp['mday']; } + elseif ($reg[1] == 'MONTH') { $tmp = dol_getdate(dol_now(), true); $newout = $tmp['mon']; } + elseif ($reg[1] == 'YEAR') { $tmp = dol_getdate(dol_now(), true); $newout = $tmp['year']; } + elseif ($reg[1] == 'PREVIOUS_DAY') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; } + elseif ($reg[1] == 'PREVIOUS_MONTH') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_prev_month($tmp['mon'], $tmp['year']); $newout = $tmp2['month']; } + elseif ($reg[1] == 'PREVIOUS_YEAR') { $tmp = dol_getdate(dol_now(), true); $newout = ($tmp['year'] - 1); } + elseif ($reg[1] == 'NEXT_DAY') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; } + elseif ($reg[1] == 'NEXT_MONTH') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_next_month($tmp['mon'], $tmp['year']); $newout = $tmp2['month']; } + elseif ($reg[1] == 'NEXT_YEAR') { $tmp = dol_getdate(dol_now(), true); $newout = ($tmp['year'] + 1); } elseif ($reg[1] == 'MYCOMPANY_COUNTRY_ID' || $reg[1] == 'MYCOUNTRY_ID' || $reg[1] == 'MYCOUNTRYID') { $newout = $mysoc->country_id; @@ -491,7 +491,7 @@ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $opti { $newout = $conf->entity; } - else $newout = ''; // Key not found, we replace with empty string + else $newout = ''; // Key not found, we replace with empty string //var_dump('__'.$reg[1].'__ -> '.$newout); $out = preg_replace('/__'.preg_quote($reg[1], '/').'__/', $newout, $out); } @@ -503,68 +503,68 @@ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $opti case 'none': break; case 'int': // Check param is a numeric value (integer but also float or hexadecimal) - if (! is_numeric($out)) { $out=''; } + if (!is_numeric($out)) { $out = ''; } 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)) + if (!is_array($out)) { - $out=trim($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=''; - elseif (preg_match('/\.\.\//', $out)) $out=''; + if (preg_match('/"/', $out)) $out = ''; + elseif (preg_match('/\.\.\//', $out)) $out = ''; } break; case 'san_alpha': - $out=filter_var($out, FILTER_SANITIZE_STRING); + $out = filter_var($out, FILTER_SANITIZE_STRING); break; case 'aZ': - if (! is_array($out)) + if (!is_array($out)) { - $out=trim($out); - if (preg_match('/[^a-z]+/i', $out)) $out=''; + $out = trim($out); + if (preg_match('/[^a-z]+/i', $out)) $out = ''; } break; case 'aZ09': - if (! is_array($out)) + if (!is_array($out)) { - $out=trim($out); - if (preg_match('/[^a-z0-9_\-\.]+/i', $out)) $out=''; + $out = trim($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)) + if (!is_array($out)) { - $out=trim($out); - if (preg_match('/[^a-z0-9_\-\.,]+/i', $out)) $out=''; + $out = trim($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); + $out = dol_string_nohtmltag($out, 0); break; case 'alphanohtml': // Recommended for search parameters - if (! is_array($out)) + if (!is_array($out)) { - $out=trim($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=''; - elseif (preg_match('/\.\.\//', $out)) $out=''; - $out=dol_string_nohtmltag($out); + if (preg_match('/"/', $out)) $out = ''; + elseif (preg_match('/\.\.\//', $out)) $out = ''; + $out = dol_string_nohtmltag($out); } break; case 'restricthtml': // Recommended for most html textarea - $out=dol_string_onlythesehtmltags($out, 0); + $out = dol_string_onlythesehtmltags($out, 0); break; case 'custom': if (empty($filter)) return 'BadFourthParameterForGETPOST'; - $out=filter_var($out, $filter, $options); + $out = filter_var($out, $filter, $options); break; } @@ -572,7 +572,7 @@ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $opti // Save data into session if key start with 'search_' or is 'smonth', 'syear', 'month', 'year' if (empty($method) || $method == 3 || $method == 4) { - if (preg_match('/^search_/', $paramname) || in_array($paramname, array('sortorder','sortfield'))) + if (preg_match('/^search_/', $paramname) || in_array($paramname, array('sortorder', 'sortfield'))) { //var_dump($paramname.' - '.$out.' '.$user->default_values[$relativepathstring]['filters'][$paramname]); @@ -582,7 +582,7 @@ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $opti if ($out != '') // $out = '0' or 'abc', it is a search criteria to keep { - $user->lastsearch_values_tmp[$relativepathstring][$paramname]=$out; + $user->lastsearch_values_tmp[$relativepathstring][$paramname] = $out; } } } @@ -591,7 +591,7 @@ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $opti } -if (! function_exists('dol_getprefix')) +if (!function_exists('dol_getprefix')) { /** * Return a prefix to use for this Dolibarr instance, for session/cookie names or email id. @@ -608,21 +608,21 @@ if (! function_exists('dol_getprefix')) // If prefix is for email if ($mode == 'email') { - if (! empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID)) // If MAIL_PREFIX_FOR_EMAIL_ID is set (a value initialized with a random value is recommended) + if (!empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID)) // If MAIL_PREFIX_FOR_EMAIL_ID is set (a value initialized with a random value is recommended) { if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID; elseif (isset($_SERVER["SERVER_NAME"])) return $_SERVER["SERVER_NAME"]; } // The recommended value (may be not defined for old versions) - if (! empty($conf->file->instance_unique_id)) return $conf->file->instance_unique_id; + if (!empty($conf->file->instance_unique_id)) return $conf->file->instance_unique_id; // For backward compatibility return dol_hash(DOL_DOCUMENT_ROOT.DOL_URL_ROOT, '3'); } // The recommended value (may be not defined for old versions) - if (! empty($conf->file->instance_unique_id)) return $conf->file->instance_unique_id; + if (!empty($conf->file->instance_unique_id)) return $conf->file->instance_unique_id; // For backward compatibility if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"])) @@ -646,7 +646,7 @@ if (! function_exists('dol_getprefix')) */ function dol_include_once($relpath, $classname = '') { - global $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 $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); @@ -655,7 +655,7 @@ function dol_include_once($relpath, $classname = '') return false; } - if (! empty($classname) && ! class_exists($classname)) { + if (!empty($classname) && !class_exists($classname)) { return include $fullpath; } else { return include_once $fullpath; @@ -677,11 +677,11 @@ function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0) { global $conf; - $path=preg_replace('/^\//', '', $path); + $path = preg_replace('/^\//', '', $path); if (empty($type)) // For a filesystem path { - $res = DOL_DOCUMENT_ROOT.'/'.$path; // Standard default path + $res = DOL_DOCUMENT_ROOT.'/'.$path; // Standard default path if (is_array($conf->file->dol_document_root)) { foreach ($conf->file->dol_document_root as $key => $dirroot) // ex: array("main"=>"/home/main/htdocs", "alt0"=>"/home/dirmod/htdocs", ...) @@ -692,14 +692,14 @@ function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0) } if (file_exists($dirroot.'/'.$path)) { - $res=$dirroot.'/'.$path; + $res = $dirroot.'/'.$path; return $res; } } } 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 @@ -708,9 +708,9 @@ function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0) // 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 // using proxy, rewriting, virtual path, etc... - $res=''; - if ($type == 1) $res = DOL_URL_ROOT.'/'.$path; // Standard value - if ($type == 2) $res = DOL_MAIN_URL_ROOT.'/'.$path; // Standard value + $res = ''; + if ($type == 1) $res = DOL_URL_ROOT.'/'.$path; // Standard value + if ($type == 2) $res = DOL_MAIN_URL_ROOT.'/'.$path; // Standard value if ($type == 3) $res = DOL_URL_ROOT.'/'.$path; foreach ($conf->file->dol_document_root as $key => $dirroot) // ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...) @@ -722,38 +722,38 @@ function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0) global $dolibarr_main_url_root; // Define $urlwithroot - $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root)); - $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file + $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root)); + $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // 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', $conf->file->dol_url_root[$key])?'':$urlwithroot).'/'.$path; // Test on start with http is for old conf syntax + $res = (preg_match('/^http/i', $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 '?' - if (! empty($regs[1])) + 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].'
'."\n"; if (file_exists($dirroot.'/'.$regs[1])) { if ($type == 1) { - $res=(preg_match('/^http/i', $conf->file->dol_url_root[$key])?'':DOL_URL_ROOT).$conf->file->dol_url_root[$key].'/'.$path; + $res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : DOL_URL_ROOT).$conf->file->dol_url_root[$key].'/'.$path; } if ($type == 2) { - $res=(preg_match('/^http/i', $conf->file->dol_url_root[$key])?'':DOL_MAIN_URL_ROOT).$conf->file->dol_url_root[$key].'/'.$path; + $res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : DOL_MAIN_URL_ROOT).$conf->file->dol_url_root[$key].'/'.$path; } if ($type == 3) { global $dolibarr_main_url_root; // Define $urlwithroot - $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root)); - $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file + $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root)); + $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // 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', $conf->file->dol_url_root[$key])?'':$urlwithroot).$conf->file->dol_url_root[$key].'/'.$path; // Test on start with http is for old conf syntax + $res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : $urlwithroot).$conf->file->dol_url_root[$key].'/'.$path; // Test on start with http is for old conf syntax } break; } @@ -778,11 +778,11 @@ function dol_clone($object, $native = 0) { if (empty($native)) { - $myclone=unserialize(serialize($object)); + $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; @@ -822,7 +822,7 @@ function dol_sanitizeFileName($str, $newstr = '_', $unaccent = 1) // Char '>' '<' '|' '$' and ';' are special chars for shells. // Char '/' and '\' are file delimiters. $filesystem_forbidden_chars = array('<', '>', '/', '\\', '?', '*', '|', '"', ':', '°', '$', ';'); - return dol_string_nospecial($unaccent?dol_string_unaccent($str):$str, $newstr, $filesystem_forbidden_chars); + return dol_string_nospecial($unaccent ?dol_string_unaccent($str) : $str, $newstr, $filesystem_forbidden_chars); } /** @@ -837,8 +837,8 @@ function dol_sanitizeFileName($str, $newstr = '_', $unaccent = 1) */ function dol_sanitizePathName($str, $newstr = '_', $unaccent = 1) { - $filesystem_forbidden_chars = array('<','>','?','*','|','"','°'); - return dol_string_nospecial($unaccent?dol_string_unaccent($str):$str, $newstr, $filesystem_forbidden_chars); + $filesystem_forbidden_chars = array('<', '>', '?', '*', '|', '"', '°'); + return dol_string_nospecial($unaccent ?dol_string_unaccent($str) : $str, $newstr, $filesystem_forbidden_chars); } /** @@ -856,21 +856,21 @@ function dol_string_unaccent($str) // See http://www.utf8-chartable.de/ $string = rawurlencode($str); $replacements = array( - '%C3%80' => 'A','%C3%81' => 'A','%C3%82' => 'A','%C3%83' => 'A','%C3%84' => 'A','%C3%85' => 'A', - '%C3%88' => 'E','%C3%89' => 'E','%C3%8A' => 'E','%C3%8B' => 'E', - '%C3%8C' => 'I','%C3%8D' => 'I','%C3%8E' => 'I','%C3%8F' => 'I', - '%C3%92' => 'O','%C3%93' => 'O','%C3%94' => 'O','%C3%95' => 'O','%C3%96' => 'O', - '%C3%99' => 'U','%C3%9A' => 'U','%C3%9B' => 'U','%C3%9C' => 'U', - '%C3%A0' => 'a','%C3%A1' => 'a','%C3%A2' => 'a','%C3%A3' => 'a','%C3%A4' => 'a','%C3%A5' => 'a', + '%C3%80' => 'A', '%C3%81' => 'A', '%C3%82' => 'A', '%C3%83' => 'A', '%C3%84' => 'A', '%C3%85' => 'A', + '%C3%88' => 'E', '%C3%89' => 'E', '%C3%8A' => 'E', '%C3%8B' => 'E', + '%C3%8C' => 'I', '%C3%8D' => 'I', '%C3%8E' => 'I', '%C3%8F' => 'I', + '%C3%92' => 'O', '%C3%93' => 'O', '%C3%94' => 'O', '%C3%95' => 'O', '%C3%96' => 'O', + '%C3%99' => 'U', '%C3%9A' => 'U', '%C3%9B' => 'U', '%C3%9C' => 'U', + '%C3%A0' => 'a', '%C3%A1' => 'a', '%C3%A2' => 'a', '%C3%A3' => 'a', '%C3%A4' => 'a', '%C3%A5' => 'a', '%C3%A7' => 'c', - '%C3%A8' => 'e','%C3%A9' => 'e','%C3%AA' => 'e','%C3%AB' => 'e', - '%C3%AC' => 'i','%C3%AD' => 'i','%C3%AE' => 'i','%C3%AF' => 'i', + '%C3%A8' => 'e', '%C3%A9' => 'e', '%C3%AA' => 'e', '%C3%AB' => 'e', + '%C3%AC' => 'i', '%C3%AD' => 'i', '%C3%AE' => 'i', '%C3%AF' => 'i', '%C3%B1' => 'n', - '%C3%B2' => 'o','%C3%B3' => 'o','%C3%B4' => 'o','%C3%B5' => 'o','%C3%B6' => 'o', - '%C3%B9' => 'u','%C3%BA' => 'u','%C3%BB' => 'u','%C3%BC' => 'u', + '%C3%B2' => 'o', '%C3%B3' => 'o', '%C3%B4' => 'o', '%C3%B5' => 'o', '%C3%B6' => 'o', + '%C3%B9' => 'u', '%C3%BA' => 'u', '%C3%BB' => 'u', '%C3%BC' => 'u', '%C3%BF' => 'y' ); - $string=strtr($string, $replacements); + $string = strtr($string, $replacements); return rawurldecode($string); } else @@ -909,9 +909,9 @@ function dol_string_unaccent($str) */ function dol_string_nospecial($str, $newstr = '_', $badcharstoreplace = '') { - $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_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("(",")"); return str_replace($forbidden_chars_to_replace, $newstr, str_replace($forbidden_chars_to_remove, "", $str)); @@ -929,13 +929,13 @@ function dol_string_nospecial($str, $newstr = '_', $badcharstoreplace = '') function dol_escape_js($stringtoescape, $mode = 0, $noescapebackslashn = 0) { // escape quotes and backslashes, newlines, etc. - $substitjs=array("'"=>"\\'","\r"=>'\\r'); + $substitjs = array("'"=>"\\'", "\r"=>'\\r'); //$substitjs['"=>'',''=>'')); - 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 + $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(""=>'', ''=>'')); + 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 } @@ -1022,28 +1022,28 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename = } } - if (! empty($message)) + if (!empty($message)) { // Test log level $logLevels = array(LOG_EMERG=>'EMERG', LOG_ALERT=>'ALERT', LOG_CRIT=>'CRITICAL', LOG_ERR=>'ERR', LOG_WARNING=>'WARN', LOG_NOTICE=>'NOTICE', LOG_INFO=>'INFO', LOG_DEBUG=>'DEBUG'); - if (! array_key_exists($level, $logLevels)) + if (!array_key_exists($level, $logLevels)) { throw new Exception('Incorrect log level'); } if ($level > $conf->global->SYSLOG_LEVEL) return; - $message = preg_replace('/password=\'[^\']*\'/', 'password=\'hidden\'', $message); // protection to avoid to have value of password in log + $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($conf->global->MAIN_ENABLE_LOG_TO_HTML)) - || (! empty($user->rights->debugbar->read) && is_object($debugbar))) + if ((!empty($_REQUEST['logtohtml']) && !empty($conf->global->MAIN_ENABLE_LOG_TO_HTML)) + || (!empty($user->rights->debugbar->read) && is_object($debugbar))) { $conf->logbuffer[] = dol_print_date(time(), "%Y-%m-%d %H:%M:%S")." ".$logLevels[$level]." ".$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($conf->global->MAIN_ENABLE_LOG_INLINE_HTML) && ! empty($_GET["log"])) + if (!empty($conf->global->MAIN_ENABLE_LOG_INLINE_HTML) && !empty($_GET["log"])) { print "\n\n'; - if ((! empty($title) && $showtitle) || $morehtmlright || ! empty($links)) { - $out.= '
'."\n";
+ if ((!empty($title) && $showtitle) || $morehtmlright || !empty($links)) {
+ $out .= '
\n";
}
- if (! $notab || $notab == -1 || $notab == -2) $out.="\n".''."\n";
}
// Show right part
- if ($morehtmlright) $out.='
\n";
+ if ((!empty($title) && $showtitle) || $morehtmlright || !empty($links)) {
+ $out .= "'.$morehtmlright.'
'; // Output right area first so when space is missing, text is in front of tabs and not under.
+ if ($morehtmlright) $out .= ''.$morehtmlright.'
'; // Output right area first so when space is missing, text is in front of tabs and not under.
// Show title
- if (! empty($title) && $showtitle)
+ if (!empty($title) && $showtitle)
{
- $limittitle=30;
- $out.='';
- if ($picto) $out.=img_picto($title, ($pictoisfullpath?'':'object_').$picto, '', $pictoisfullpath).' ';
- $out.=''.dol_trunc($title, $limittitle).'';
- $out.='';
+ $limittitle = 30;
+ $out .= '';
+ if ($picto) $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_').$picto, '', $pictoisfullpath).' ';
+ $out .= ''.dol_trunc($title, $limittitle).'';
+ $out .= '';
}
// Show tabs
// Define max of key (max may be higher than sizeof because of hole due to module disabling some tabs).
- $maxkey=-1;
- if (is_array($links) && ! empty($links))
+ $maxkey = -1;
+ if (is_array($links) && !empty($links))
{
- $keys=array_keys($links);
- if (count($keys)) $maxkey=max($keys);
+ $keys = array_keys($links);
+ if (count($keys)) $maxkey = max($keys);
}
- if (! empty($conf->dol_optimize_smallscreen)) $conf->global->MAIN_MAXTABS_IN_CARD=2;
+ if (!empty($conf->dol_optimize_smallscreen)) $conf->global->MAIN_MAXTABS_IN_CARD = 2;
// Show tabs
// if =0 we don't use the feature
- $limittoshow=(empty($conf->global->MAIN_MAXTABS_IN_CARD)?99:$conf->global->MAIN_MAXTABS_IN_CARD);
- $displaytab=0;
- $nbintab=0;
- $popuptab=0;
- $outmore='';
- for ($i = 0 ; $i <= $maxkey ; $i++)
+ $limittoshow = (empty($conf->global->MAIN_MAXTABS_IN_CARD) ? 99 : $conf->global->MAIN_MAXTABS_IN_CARD);
+ $displaytab = 0;
+ $nbintab = 0;
+ $popuptab = 0;
+ $outmore = '';
+ for ($i = 0; $i <= $maxkey; $i++)
{
- if ((is_numeric($active) && $i == $active) || (! empty($links[$i][2]) && ! is_numeric($active) && $active == $links[$i][2])) {
+ 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--;
}
}
- for ($i = 0 ; $i <= $maxkey ; $i++)
+ for ($i = 0; $i <= $maxkey; $i++)
{
- if ((is_numeric($active) && $i == $active) || (! empty($links[$i][2]) && ! is_numeric($active) && $active == $links[$i][2])) {
- $isactive=true;
+ if ((is_numeric($active) && $i == $active) || (!empty($links[$i][2]) && !is_numeric($active) && $active == $links[$i][2])) {
+ $isactive = true;
}
else {
- $isactive=false;
+ $isactive = false;
}
if ($i < $limittoshow || $isactive)
{
- $out.='';
}
else
{
// The popup with the other tabs
- if (! $popuptab)
+ if (!$popuptab)
{
- $popuptab=1;
- $outmore.=''; // The css used to hide/show popup
+ $popuptab = 1;
+ $outmore .= '
';
if ($popuptab) // If there is some tabs not shown
{
- $left=($langs->trans("DIRECTION") == 'rtl'?'right':'left');
- $right=($langs->trans("DIRECTION") == 'rtl'?'left':'right');
+ $left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
+ $right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');
- $tabsname=str_replace("@", "", $picto);
- $out.=''; // The css used to hide/show popup
}
- $outmore.='
';
+ if ($popuptab) $outmore .= '';
+ $outmore .= '
';
$nbintab++;
}
- $displaytab=$i;
+ $displaytab = $i;
}
- if ($popuptab) $outmore.='';
if (isset($links[$i][2]) && $links[$i][2] == 'image')
{
if (!empty($links[$i][0]))
- $outmore.=''.$links[$i][1].''."\n";
+ $outmore .= ''.$links[$i][1].''."\n";
else
- $outmore.=''.$links[$i][1].''."\n";
+ $outmore .= ''.$links[$i][1].''."\n";
}
- elseif (! empty($links[$i][1]))
+ elseif (!empty($links[$i][1]))
{
- $outmore.='';
- $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.=''."\n";
+ $outmore .= '';
+ $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 .= ''."\n";
}
- $outmore.='
';
+ $outmore .= '';
- $out.=''.$langs->trans("More").'... ('.$nbintab.')';
- $out.='
\n";
+ $tabsname = str_replace("@", "", $picto);
+ $out .= '';
- $out.=$outmore;
- $out.='
';
- $out.='';
- $out.="';
+ $out .= ''.$langs->trans("More").'... ('.$nbintab.')';
+ $out .= '
\n";
- $out.="";
+ $out .= "";
}
- if ((! empty($title) && $showtitle) || $morehtmlright || ! empty($links)) {
- $out.="';
+ $out .= $outmore;
+ $out .= '
';
+ $out .= '';
+ $out .= "'."\n";
+ if (!$notab || $notab == -1 || $notab == -2) $out .= "\n".'
\n";
else return '';
}
@@ -1327,79 +1327,79 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
$error = 0;
- $maxvisiblephotos=1;
- $showimage=1;
- $entity=(empty($object->entity)?$conf->entity:$object->entity);
- $showbarcode=empty($conf->barcode->enabled)?0:($object->barcode?1:0);
- if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
- $modulepart='unknown';
+ $maxvisiblephotos = 1;
+ $showimage = 1;
+ $entity = (empty($object->entity) ? $conf->entity : $object->entity);
+ $showbarcode = empty($conf->barcode->enabled) ? 0 : ($object->barcode ? 1 : 0);
+ if (!empty($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 == 'ticket') $modulepart='ticket';
+ 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 == 'ticket') $modulepart = 'ticket';
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')
{
- $width=80; $cssclass='photoref';
- $showimage=$object->is_photo_available($conf->product->multidir_output[$entity]);
- $maxvisiblephotos=(isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO)?$conf->global->PRODUCT_MAX_VISIBLE_PHOTO:5);
- if ($conf->browser->layout == 'phone') $maxvisiblephotos=1;
- if ($showimage) $morehtmlleft.=''."\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"
+ $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"
if ($reshook > 0)
{
$out = $hookmanager->resPrint;
@@ -1298,7 +1298,7 @@ function dol_fiche_end($notab = 0)
*/
function dol_get_fiche_end($notab = 0)
{
- if (! $notab || $notab == -1) return "\n
\n";
+ if (!$notab || $notab == -1) return "\n'.$object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'
';
+ $width = 80; $cssclass = 'photoref';
+ $showimage = $object->is_photo_available($conf->product->multidir_output[$entity]);
+ $maxvisiblephotos = (isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO) ? $conf->global->PRODUCT_MAX_VISIBLE_PHOTO : 5);
+ if ($conf->browser->layout == 'phone') $maxvisiblephotos = 1;
+ if ($showimage) $morehtmlleft .= ''.$object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'
';
else
{
if (!empty($conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {
- $nophoto='';
- $morehtmlleft.='';
+ $nophoto = '';
+ $morehtmlleft .= '';
}
else { // Show no photo link
- $nophoto='/public/theme/common/nophoto.png';
- $morehtmlleft.=''.$showphoto.'
';
+ $morehtmlleft .= ''.$showphoto.'
';
}
else
{
$showimage = 0;
}
}
- if (! $showimage)
+ if (!$showimage)
{
if (!empty($conf->global->TICKET_NODISPLAYIFNOPHOTO)) {
- $nophoto='';
- $morehtmlleft.='';
+ $nophoto = '';
+ $morehtmlleft .= '';
}
else { // Show no photo link
- $nophoto='/public/theme/common/nophoto.png';
- $morehtmlleft.='';
- $phototoshow.= '.')
';
- $phototoshow.= '
';
- $htmllink.='
';
- $htmllink.='