@@ -85,7 +85,7 @@ |
||
85 | 85 | $conf->file->main_force_https = empty($dolibarr_main_force_https) ? '' : $dolibarr_main_force_https; // Force https |
86 | 86 | $conf->file->strict_mode = empty($dolibarr_strict_mode) ? '' : $dolibarr_strict_mode; // Force php strict mode (for debug) |
87 | 87 | $conf->file->instance_unique_id = empty($dolibarr_main_instance_unique_id) ? (empty($dolibarr_main_cookie_cryptkey) ? '' : $dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id; // Unique id of instance |
88 | -$conf->file->dol_main_url_root = $dolibarr_main_url_root; // Define url inside the config file |
|
88 | +$conf->file->dol_main_url_root = $dolibarr_main_url_root; // Define url inside the config file |
|
89 | 89 | $conf->file->dol_document_root = array('main' => (string) DOL_DOCUMENT_ROOT); // Define array of document root directories ('/home/htdocs') |
90 | 90 | $conf->file->dol_url_root = array('main' => (string) DOL_URL_ROOT); // Define array of url root path ('' or '/dolibarr') |
91 | 91 | if (!empty($dolibarr_main_document_root_alt)) { |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'knowledgerecordcard'; // To manage different context of search |
46 | 46 | $backtopage = GETPOST('backtopage', 'alpha'); |
47 | 47 | $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); |
48 | -$lineid = GETPOSTINT('lineid'); |
|
48 | +$lineid = GETPOSTINT('lineid'); |
|
49 | 49 | |
50 | 50 | // Initialize technical objects |
51 | 51 | $object = new KnowledgeRecord($db); |
@@ -426,7 +426,7 @@ discard block |
||
426 | 426 | print '<table class="border centpercent tableforfield">' . "\n"; |
427 | 427 | |
428 | 428 | // Common attributes |
429 | - $keyforbreak = 'fk_c_ticket_category'; // We change column just before this field |
|
429 | + $keyforbreak = 'fk_c_ticket_category'; // We change column just before this field |
|
430 | 430 | //unset($object->fields['fk_project']); // Hide field already shown in banner |
431 | 431 | //unset($object->fields['fk_soc']); // Hide field already shown in banner |
432 | 432 | $object->fields['answer']['enabled'] = 0; |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | |
85 | 85 | // Default sort order (if not yet defined by previous GETPOST) |
86 | 86 | if (!$sortfield) { |
87 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
87 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
88 | 88 | $sortfield = "t." . key($object->fields); // Set here default search field. By default 1st field in definition. |
89 | 89 | } |
90 | 90 | if (!$sortorder) { |
@@ -615,7 +615,7 @@ discard block |
||
615 | 615 | } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) { |
616 | 616 | $cssforfield .= ($cssforfield ? ' ' : '') . 'right'; |
617 | 617 | } |
618 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
618 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
619 | 619 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
620 | 620 | print getTitleFieldOfList($arrayfields['t.' . $key]['label'], 0, $_SERVER['PHP_SELF'], 't.' . $key, '', $param, ($cssforfield ? 'class="' . $cssforfield . '"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield . ' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist'])) . "\n"; |
621 | 621 | $totalarray['nbfield']++; |
@@ -719,7 +719,7 @@ discard block |
||
719 | 719 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
720 | 720 | print '<td' . ($cssforfield ? ' class="' . $cssforfield . (preg_match('/tdoverflow/', $cssforfield) ? ' classfortooltip' : '') . '"' : ''); |
721 | 721 | if (preg_match('/tdoverflow/', $cssforfield) && !is_numeric($object->$key)) { |
722 | - print ' title="' . dol_escape_htmltag(dol_nl2br($object->$key, 1)) . '"'; // We add dol_nl2br for the question and answer fields |
|
722 | + print ' title="' . dol_escape_htmltag(dol_nl2br($object->$key, 1)) . '"'; // We add dol_nl2br for the question and answer fields |
|
723 | 723 | } |
724 | 724 | print '>'; |
725 | 725 | if ($key == 'status') { |
@@ -1171,13 +1171,13 @@ discard block |
||
1171 | 1171 | } |
1172 | 1172 | if ($key == 'js') { |
1173 | 1173 | $value = $obj->value; |
1174 | - $valuearray = (array) json_decode($value); // Force cast into array because sometimes it is a stdClass |
|
1174 | + $valuearray = (array) json_decode($value); // Force cast into array because sometimes it is a stdClass |
|
1175 | 1175 | $reloffile = $valuearray[0]; |
1176 | 1176 | $reloffile = preg_replace('/^\//', '', $valuearray[0]); |
1177 | 1177 | } |
1178 | 1178 | if ($key == 'css') { |
1179 | 1179 | $value = $obj->value; |
1180 | - $valuearray = (array) json_decode($value); // Force cast into array because sometimes it is a stdClass |
|
1180 | + $valuearray = (array) json_decode($value); // Force cast into array because sometimes it is a stdClass |
|
1181 | 1181 | if ($value && (!is_array($valuearray) || count($valuearray) == 0)) { |
1182 | 1182 | $valuearray = array(); |
1183 | 1183 | $valuearray[0] = $value; // If value was not a json array but a string |
@@ -1193,7 +1193,7 @@ discard block |
||
1193 | 1193 | $result = 'found'; // If error, we force like if we found to avoid any deletion |
1194 | 1194 | } |
1195 | 1195 | } else { |
1196 | - $result = 'found'; // |
|
1196 | + $result = 'found'; // |
|
1197 | 1197 | } |
1198 | 1198 | |
1199 | 1199 | if (!$result) { |
@@ -1572,7 +1572,7 @@ discard block |
||
1572 | 1572 | |
1573 | 1573 | $sql_attach = 'INSERT INTO ' . MAIN_DB_PREFIX . 'receptiondet_batch'; |
1574 | 1574 | $sql_attach .= ' (fk_element, fk_product, fk_elementdet, qty, fk_entrepot, fk_user, datec, comment, status, tms, batch, eatby, sellby)'; |
1575 | - $sql_attach .= " VALUES (" . $sql_attach_values . ")"; // The string is already sanitized |
|
1575 | + $sql_attach .= " VALUES (" . $sql_attach_values . ")"; // The string is already sanitized |
|
1576 | 1576 | } |
1577 | 1577 | |
1578 | 1578 | if ($repair_link_dispatch_lines_supplier_order_lines == 'confirmed') { |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php // BEGIN PHP |
2 | 2 | $websitekey = basename(__DIR__); |
3 | -if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__ . '/master.inc.php'; |
|
3 | +if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once __DIR__ . '/master.inc.php'; |
|
4 | 4 | } // Load env if not already loaded |
5 | 5 | require_once constant('DOL_DOCUMENT_ROOT') . '/core/lib/website.lib.php'; |
6 | 6 | require_once constant('DOL_DOCUMENT_ROOT') . '/core/website.inc.php'; |
@@ -1,11 +1,11 @@ |
||
1 | 1 | <?php // BEGIN PHP |
2 | 2 | $websitekey = basename(__DIR__); |
3 | -if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__ . '/master.inc.php'; |
|
3 | +if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once __DIR__ . '/master.inc.php'; |
|
4 | 4 | } // Load env if not already loaded |
5 | 5 | require_once constant('DOL_DOCUMENT_ROOT') . '/core/lib/website.lib.php'; |
6 | 6 | require_once constant('DOL_DOCUMENT_ROOT') . '/core/website.inc.php'; |
7 | 7 | ob_start(); |
8 | -if (! headers_sent()) { /* because file is included inline when in edit mode and we don't want warning */ |
|
8 | +if (!headers_sent()) { /* because file is included inline when in edit mode and we don't want warning */ |
|
9 | 9 | header('Cache-Control: max-age=3600, public, must-revalidate'); |
10 | 10 | header('Content-type: text/css'); |
11 | 11 | } |
@@ -1,7 +1,7 @@ |
||
1 | 1 | <?php |
2 | 2 | // BEGIN PHP |
3 | 3 | $websitekey = basename(__DIR__); |
4 | -if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__ . '/master.inc.php'; |
|
4 | +if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once __DIR__ . '/master.inc.php'; |
|
5 | 5 | } // Load env if not already loaded |
6 | 6 | require_once constant('DOL_DOCUMENT_ROOT') . '/core/lib/website.lib.php'; |
7 | 7 | require_once constant('DOL_DOCUMENT_ROOT') . '/core/website.inc.php'; |
@@ -4211,7 +4211,7 @@ discard block |
||
4211 | 4211 | |
4212 | 4212 | if (!is_object($user)) { |
4213 | 4213 | include_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php'; |
4214 | - $user = new User($db); // To avoid error during migration |
|
4214 | + $user = new User($db); // To avoid error during migration |
|
4215 | 4215 | } |
4216 | 4216 | |
4217 | 4217 | dolibarr_install_syslog("upgrade2::migrate_reload_modules force=" . $force . ", listofmodule=" . implode(',', array_keys($listofmodule))); |
@@ -5042,7 +5042,7 @@ discard block |
||
5042 | 5042 | $error++; |
5043 | 5043 | } |
5044 | 5044 | |
5045 | - $current_contract = $obj->cid; |
|
5045 | + $current_contract = $obj->cid; |
|
5046 | 5046 | } |
5047 | 5047 | } else { |
5048 | 5048 | $error++; |
@@ -360,7 +360,7 @@ discard block |
||
360 | 360 | $conf->db->name = $dolibarr_main_db_name; |
361 | 361 | $conf->db->user = $dolibarr_main_db_user; |
362 | 362 | $conf->db->pass = $dolibarr_main_db_pass; |
363 | - $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, (int)$conf->db->port); |
|
363 | + $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, (int) $conf->db->port); |
|
364 | 364 | if ($db->connected && $db->database_selected) { |
365 | 365 | $ok = true; |
366 | 366 | } |
@@ -457,7 +457,7 @@ discard block |
||
457 | 457 | $allowupgrade = true; |
458 | 458 | } |
459 | 459 | |
460 | - $dir = DOL_DOCUMENT_ROOT . "/install/mysql/migration/"; // We use mysql migration scripts whatever is database driver |
|
460 | + $dir = DOL_DOCUMENT_ROOT . "/install/mysql/migration/"; // We use mysql migration scripts whatever is database driver |
|
461 | 461 | dolibarr_install_syslog("Scan sql files for migration files in " . $dir); |
462 | 462 | |
463 | 463 | // Get files list of migration file x.y.z-a.b.c.sql into /install/mysql/migration |