Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Removed warnings

Browse Source
This commit is contained in:
Laurent Destailleur
2019-04-23 10:24:16 +02:00
parent f19d96bf8d
commit 7c7c4f0d93
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/core/lib/accounting.lib.php
View File

@@ -108,7 +108,7 @@ function length_accountg($account)
*/ */
function length_accounta($accounta) function length_accounta($accounta)
{ {
global $conf, $langs; global $conf;
if ($accounta < 0 || empty($accounta)) return ''; if ($accounta < 0 || empty($accounta)) return '';
@@ -156,12 +156,11 @@ function journalHead($nom, $variante, $period, $periodlink, $description, $build
{ {
global $langs; global $langs;
if (empty($hselected)) $hselected='report';
print "\n\n<!-- debut cartouche journal -->\n"; print "\n\n<!-- debut cartouche journal -->\n";
if(! empty($varlink)) $varlink = '?'.$varlink; if(! empty($varlink)) $varlink = '?'.$varlink;
$head=array();
$h=0; $h=0;
$head[$h][0] = $_SERVER["PHP_SELF"].$varlink; $head[$h][0] = $_SERVER["PHP_SELF"].$varlink;
$head[$h][1] = $langs->trans("Journalization"); $head[$h][1] = $langs->trans("Journalization");
@@ -180,10 +179,8 @@ function journalHead($nom, $variante, $period, $periodlink, $description, $build
// Ligne de titre // Ligne de titre
print '<tr>'; print '<tr>';
print '<td width="110">'.$langs->trans("Name").'</td>'; print '<td width="110">'.$langs->trans("Name").'</td>';
if (! $variantexxx) print '<td colspan="3">'; print '<td colspan="3">';
else print '<td>';
print $nom; print $nom;
if ($variantexxx) print '</td><td colspan="2">'.$variantexxx;
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';

17
htdocs/core/lib/admin.lib.php
View File

@@ -160,6 +160,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
else $buf = fgets($fp); else $buf = fgets($fp);
// Test if request must be ran only for particular database or version (if yes, we must remove the -- comment) // Test if request must be ran only for particular database or version (if yes, we must remove the -- comment)
$reg=array();
if (preg_match('/^--\sV(MYSQL|PGSQL)([^\s]*)/i', $buf, $reg)) if (preg_match('/^--\sV(MYSQL|PGSQL)([^\s]*)/i', $buf, $reg))
{ {
$qualified=1; $qualified=1;
@@ -794,8 +795,9 @@ function listOfSessions()
{ {
$tmp=explode('_', $file); $tmp=explode('_', $file);
$idsess=$tmp[1]; $idsess=$tmp[1];
$login = preg_match('/dol_login\|s:[0-9]+:"([A-Za-z0-9]+)"/i', $sessValues, $regs); $regs=array();
$arrayofSessions[$idsess]["login"] = $regs[1]; $loginfound = preg_match('/dol_login\|s:[0-9]+:"([A-Za-z0-9]+)"/i', $sessValues, $regs);
if ($loginfound) $arrayofSessions[$idsess]["login"] = $regs[1];
$arrayofSessions[$idsess]["age"] = time()-filectime($fullpath); $arrayofSessions[$idsess]["age"] = time()-filectime($fullpath);
$arrayofSessions[$idsess]["creation"] = filectime($fullpath); $arrayofSessions[$idsess]["creation"] = filectime($fullpath);
$arrayofSessions[$idsess]["modification"] = filemtime($fullpath); $arrayofSessions[$idsess]["modification"] = filemtime($fullpath);
@@ -820,7 +822,6 @@ function purgeSessions($mysessionid)
{ {
global $conf; global $conf;
$arrayofSessions = array();
$sessPath = ini_get("session.save_path")."/"; $sessPath = ini_get("session.save_path")."/";
dol_syslog('admin.lib:purgeSessions mysessionid='.$mysessionid.' sessPath='.$sessPath); dol_syslog('admin.lib:purgeSessions mysessionid='.$mysessionid.' sessPath='.$sessPath);
@@ -868,7 +869,9 @@ function purgeSessions($mysessionid)
*/ */
function activateModule($value, $withdeps = 1) function activateModule($value, $withdeps = 1)
{ {
global $db, $modules, $langs, $conf, $mysoc; global $db, $langs, $conf, $mysoc;
$ret=array();
// Check parameters // Check parameters
if (empty($value)) { if (empty($value)) {
@@ -1689,8 +1692,10 @@ function phpinfo_array()
foreach($info_lines as $line) foreach($info_lines as $line)
{ {
// new cat? // new cat?
$title = array();
preg_match("~<h2>(.*)</h2>~", $line, $title) ? $cat = $title[1] : null; preg_match("~<h2>(.*)</h2>~", $line, $title) ? $cat = $title[1] : null;
if(preg_match("~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~", $line, $val)) $val = array();
if (preg_match("~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~", $line, $val))
{ {
$info_arr[trim($cat)][trim($val[1])] = $val[2]; $info_arr[trim($cat)][trim($val[1])] = $val[2];
} }
@@ -1709,7 +1714,7 @@ function phpinfo_array()
*/ */
function company_admin_prepare_head() function company_admin_prepare_head()
{ {
global $langs, $conf, $user; global $langs, $conf;
$h = 0; $h = 0;
$head = array(); $head = array();

1
htdocs/index.php
View File

@@ -36,7 +36,6 @@ $action=GETPOST('action', 'aZ09');
$hookmanager->initHooks(array('index')); $hookmanager->initHooks(array('index'));
/* /*
* Actions * Actions
*/ */