Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 01:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix img_pictos (#35722)

Browse Source 
* fix img_pictos

* fix img_pictos

* fix img_pictos

* fix img_pictos

* fix img_pictos

* fix img_pictos

* fix img_pictos

* fix img_pictos
This commit is contained in:
Frédéric FRANCE
2025-10-14 19:31:06 +02:00
committed by GitHub
parent 6f83be9cf4
commit 1ad2d24a4b
44 changed files with 155 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -757,8 +757,6 @@ function GETPOSTISSET($paramname)
}
$relativepathstring = ltrim($relativepathstring, '/');
$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
//var_dump($relativepathstring);
//var_dump($user->default_values);
// Code for search criteria persistence.
// Retrieve values if restore_lastsearch_values
@@ -882,8 +880,6 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
}
$relativepathstring = ltrim($relativepathstring, '/');
$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
//var_dump($relativepathstring);
//var_dump($user->default_values);
// Code for search criteria persistence.
// Retrieve saved values if restore_lastsearch_values is set
@@ -940,7 +936,6 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
if (!$foundintru) {
$qualified = 1;
}
//var_dump($defkey.'-'.$qualified);
} else {
$qualified = 1;
}
@@ -977,7 +972,6 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
if (!$foundintru) {
$qualified = 1;
}
//var_dump($defkey.'-'.$qualified);
} else {
$qualified = 1;
}
@@ -1017,7 +1011,6 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
if (!$foundintru) {
$qualified = 1;
}
//var_dump($defkey.'-'.$qualified);
} else {
$qualified = 1;
}
@@ -3912,7 +3905,6 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
array('T', 'Z', '__a__', '__A__', '__b__', '__B__'),
$ret
);
//var_dump($ret);exit;
} else {
$ret = 'Bad value ' . $time . ' for date';
}
@@ -4101,13 +4093,11 @@ function dol_mktime($hour, $minute, $second, $month, $day, $year, $gm = 'auto',
if (empty($localtz)) {
$localtz = new DateTimeZone('UTC');
}
//var_dump($localtz);
//var_dump($year.'-'.$month.'-'.$day.'-'.$hour.'-'.$minute);
$dt = new DateTime('now', $localtz);
$dt->setDate((int) $year, (int) $month, (int) $day);
$dt->setTime((int) $hour, (int) $minute, (int) $second);
$date = $dt->getTimestamp(); // should include daylight saving time
//var_dump($date);
return $date;
}
@@ -5430,7 +5420,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $srco
}
} else {
// $picto can not be null since replaced with 'generic' in that case
//$pictowithouttext = preg_replace('/(\.png|\.gif|\.svg)$/', '', (is_null($picto) ? '' : $picto));
// $pictowithouttext = preg_replace('/(\.png|\.gif|\.svg)$/', '', (is_null($picto) ? '' : $picto));
$pictowithouttext = preg_replace('/(\.png|\.gif|\.svg)$/', '', $picto);
$pictowithouttext = str_replace('object_', '', $pictowithouttext);
$pictowithouttext = str_replace('_nocolor', '', $pictowithouttext);
@@ -6234,7 +6224,7 @@ function img_delete($titlealt = 'default', $other = 'class="pictodelete"', $more
$titlealt = $langs->trans('Delete');
}
return img_picto($titlealt, 'delete.png', $other, 0, 0, 0, '', $morecss);
return img_picto($titlealt, 'delete', $other, 0, 0, 0, '', $morecss);
}
/**
@@ -6250,7 +6240,7 @@ function img_printer($titlealt = "default", $other = '')
if ($titlealt == "default") {
$titlealt = $langs->trans("Print");
}
return img_picto($titlealt, 'printer.png', $other);
return img_picto($titlealt, 'printer', $other);
}
/**
@@ -6268,7 +6258,7 @@ function img_split($titlealt = 'default', $other = 'class="pictosplit"')
$titlealt = $langs->trans('Split');
}
return img_picto($titlealt, 'split.png', $other);
return img_picto($titlealt, 'split', $other);
}
/**
@@ -6290,7 +6280,7 @@ function img_help($usehelpcursor = 1, $usealttitle = 1)
}
}
return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;' . ($usehelpcursor == 1 ? ' cursor: help' : ($usehelpcursor == 2 ? ' cursor: pointer' : '')) . '"');
return img_picto($usealttitle, 'info', 'style="vertical-align: middle;' . ($usehelpcursor == 1 ? ' cursor: help' : ($usehelpcursor == 2 ? ' cursor: pointer' : '')) . '"');
}
/**
@@ -6401,7 +6391,7 @@ function img_down($titlealt = 'default', $selected = 0, $moreclass = '')
$titlealt = $langs->trans('Down');
}
return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown' . ($moreclass ? " " . $moreclass : "") . '"');
return img_picto($titlealt, ($selected ? '1downarrow_selected' : '1downarrow'), 'class="imgdown' . ($moreclass ? " " . $moreclass : "") . '"');
}
/**
@@ -6420,7 +6410,7 @@ function img_up($titlealt = 'default', $selected = 0, $moreclass = '')
$titlealt = $langs->trans('Up');
}
return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup' . ($moreclass ? " " . $moreclass : "") . '"');
return img_picto($titlealt, ($selected ? '1uparrow_selected' : '1uparrow'), 'class="imgup' . ($moreclass ? " " . $moreclass : "") . '"');
}
/**
@@ -6439,7 +6429,7 @@ function img_left($titlealt = 'default', $selected = 0, $moreatt = '')
$titlealt = $langs->trans('Left');
}
return img_picto($titlealt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'), $moreatt);
return img_picto($titlealt, ($selected ? '1leftarrow_selected' : '1leftarrow'), $moreatt);
}
/**
@@ -6458,7 +6448,7 @@ function img_right($titlealt = 'default', $selected = 0, $moreatt = '')
$titlealt = $langs->trans('Right');
}
return img_picto($titlealt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'), $moreatt);
return img_picto($titlealt, ($selected ? '1rightarrow_selected' : '1rightarrow'), $moreatt);
}
/**
@@ -7096,7 +7086,7 @@ function print_barre_liste($title, $page, $file, $options = '', $sortfield = '',
$page = (int) $page;
if ($picto == 'setup') {
$picto = 'title_setup.png';
$picto = 'title_setup';
}
if (($conf->browser->name == 'ie') && $picto == 'generic') {
$picto = 'title.gif';
@@ -7217,7 +7207,6 @@ function print_barre_liste($title, $page, $file, $options = '', $sortfield = '',
$pagelist .= '<li class="pagination"><a class="reposition" href="' . dolBuildUrl($file, $query) . '">' . $nbpages . '</a></li>';
}
} else {
//var_dump($page.' '.$cpt.' '.$nbpages);
$query['page'] = ($nbpages - 1);
$pagelist .= '<li class="pagination paginationlastpage"><a class="reposition" href="' . dolBuildUrl($file, $query) . '">' . $nbpages . '</a></li>';
}