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

Fix remove warnings

Browse Source
This commit is contained in:
Laurent Destailleur
2023-08-14 23:09:40 +02:00
parent 865c712b55
commit 81e96f8787
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/tools/listevents.php
View File

@@ -440,7 +440,7 @@ if ($result) {
print '</td>'; print '</td>';
} }
// Date // ID
print '<td class="nowrap left">'.dol_escape_htmltag($obj->rowid).'</td>'; print '<td class="nowrap left">'.dol_escape_htmltag($obj->rowid).'</td>';
// Date // Date

3
htdocs/core/class/translate.class.php
View File

@@ -266,7 +266,8 @@ class Translate
$file_lang = $searchdir . ($modulename ? '/' . $modulename : '') . "/langs/" . $langofdir . "/" . $newdomain . ".lang"; $file_lang = $searchdir . ($modulename ? '/' . $modulename : '') . "/langs/" . $langofdir . "/" . $newdomain . ".lang";
$file_lang_osencoded = dol_osencode($file_lang); $file_lang_osencoded = dol_osencode($file_lang);
$filelangexists = is_file($file_lang_osencoded); //$filelangexists = is_file($file_lang_osencoded);
$filelangexists = @is_file($file_lang_osencoded); // avoid [php:warn]
//dol_syslog(get_class($this).'::Load Try to read for alt='.$alt.' langofdir='.$langofdir.' domain='.$domain.' newdomain='.$newdomain.' modulename='.$modulename.' file_lang='.$file_lang." => filelangexists=".$filelangexists); //dol_syslog(get_class($this).'::Load Try to read for alt='.$alt.' langofdir='.$langofdir.' domain='.$domain.' newdomain='.$newdomain.' modulename='.$modulename.' file_lang='.$file_lang." => filelangexists=".$filelangexists);
//print 'Try to read for alt='.$alt.' langofdir='.$langofdir.' domain='.$domain.' newdomain='.$newdomain.' modulename='.$modulename.' this->_tab_loaded[newdomain]='.$this->_tab_loaded[$newdomain].' file_lang='.$file_lang." => filelangexists=".$filelangexists."\n"; //print 'Try to read for alt='.$alt.' langofdir='.$langofdir.' domain='.$domain.' newdomain='.$newdomain.' modulename='.$modulename.' this->_tab_loaded[newdomain]='.$this->_tab_loaded[$newdomain].' file_lang='.$file_lang." => filelangexists=".$filelangexists."\n";

6
htdocs/core/lib/functions.lib.php
View File

@@ -1168,7 +1168,8 @@ function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0)
if ($key == 'main') { if ($key == 'main') {
continue; continue;
} }
if (file_exists($dirroot.'/'.$path)) { // if (@file_exists($dirroot.'/'.$path)) {
if (@file_exists($dirroot.'/'.$path)) { // avoid [php:warn]
$res = $dirroot.'/'.$path; $res = $dirroot.'/'.$path;
return $res; return $res;
} }
@@ -1215,7 +1216,8 @@ function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0)
preg_match('/^([^\?]+(\.css\.php|\.css|\.js\.php|\.js|\.png|\.jpg|\.php)?)/i', $path, $regs); // Take part before '?' preg_match('/^([^\?]+(\.css\.php|\.css|\.js\.php|\.js|\.png|\.jpg|\.php)?)/i', $path, $regs); // Take part before '?'
if (!empty($regs[1])) { if (!empty($regs[1])) {
//print $key.'-'.$dirroot.'/'.$path.'-'.$conf->file->dol_url_root[$type].'<br>'."\n"; //print $key.'-'.$dirroot.'/'.$path.'-'.$conf->file->dol_url_root[$type].'<br>'."\n";
if (file_exists($dirroot.'/'.$regs[1])) { //if (file_exists($dirroot.'/'.$regs[1])) {
if (@file_exists($dirroot.'/'.$regs[1])) { // avoid [php:warn]
if ($type == 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;
} }

2
htdocs/user/logout.php
View File

@@ -50,7 +50,7 @@ if (!empty($_SESSION["dol_authmode"]) && ($_SESSION["dol_authmode"] == 'forceuse
unset($_SESSION["dol_login"]); unset($_SESSION["dol_login"]);
unset($_SESSION['dol_entity']); unset($_SESSION['dol_entity']);
unset($_SESSION['urlfrom']); unset($_SESSION['urlfrom']);
die("Applicative disconnection should be useless when connection was made in mode ".$_SESSION["dol_authmode"]); die("Applicative disconnection should be useless when connection was made in mode ".$_SESSION["dol_authmode"]); // TODO Really ? It at least delete the session file ?!
} }
//global $conf, $langs, $user; //global $conf, $langs, $user;