Skip to content
Snippets Groups Projects
Commit 0023b221 authored by Till's avatar Till
Browse files

More php 8 fixes.

parent c382be21
No related branches found
No related tags found
No related merge requests found
...@@ -42,7 +42,7 @@ class validate_datetime ...@@ -42,7 +42,7 @@ class validate_datetime
{ {
if (is_array($field_value) && count($field_value) >= 5) if (is_array($field_value) && count($field_value) >= 5)
{ {
$result = array_filter($field_value, create_function('$dt_unit', 'return ($dt_unit > 0);')); $result = array_filter($field_value, function($dt_unit) {return ($dt_unit > 0);});
return count($result) !== 0; return count($result) !== 0;
} }
...@@ -86,7 +86,7 @@ class validate_datetime ...@@ -86,7 +86,7 @@ class validate_datetime
{ {
if(!is_array($field_value)) return 0; if(!is_array($field_value)) return 0;
$second = 0; $second = 0;
$filtered_values = array_map(create_function('$item', 'return (int)$item;'), $field_value); $filtered_values = array_map(function($item) {return (int)$item;}, $field_value);
extract($filtered_values, EXTR_OVERWRITE); extract($filtered_values, EXTR_OVERWRITE);
return mktime($hour, $minute, $second, $month, $day, $year); return mktime($hour, $minute, $second, $month, $day, $year);
......
...@@ -64,8 +64,8 @@ class page_action extends tform_actions { ...@@ -64,8 +64,8 @@ class page_action extends tform_actions {
//* if autoresponder checkbox not selected, do not save dates //* if autoresponder checkbox not selected, do not save dates
if (!isset($_POST['autoresponder']) && array_key_exists('autoresponder_start_date', $_POST)) { if (!isset($_POST['autoresponder']) && array_key_exists('autoresponder_start_date', $_POST)) {
$this->dataRecord['autoresponder_start_date'] = array_map(create_function('$item', 'return 0;'), $this->dataRecord['autoresponder_start_date']); $this->dataRecord['autoresponder_start_date'] = array_map(function($item) { return 0;}), $this->dataRecord['autoresponder_start_date']);
$this->dataRecord['autoresponder_end_date'] = array_map(create_function('$item', 'return 0;'), $this->dataRecord['autoresponder_end_date']); $this->dataRecord['autoresponder_end_date'] = array_map(function($item) { return 0;}), $this->dataRecord['autoresponder_end_date']);
/* To be used when we go to PHP 7.x as min PHP version /* To be used when we go to PHP 7.x as min PHP version
$this->dataRecord['autoresponder_start_date'] = array_map( function ('$item') { 'return 0;' }, $this->dataRecord['autoresponder_start_date']); $this->dataRecord['autoresponder_start_date'] = array_map( function ('$item') { 'return 0;' }, $this->dataRecord['autoresponder_start_date']);
......
...@@ -78,7 +78,7 @@ class cronjob_monitor_cpu extends cronjob { ...@@ -78,7 +78,7 @@ class cronjob_monitor_cpu extends cronjob {
$part = preg_split('/:/', $line); $part = preg_split('/:/', $line);
$key = trim($part[0]); $key = trim($part[0]);
$value = trim($part[1]); $value = (isset($part[1]))?trim($part[1]):'';
if ($key == 'processor') if ($key == 'processor')
$processor = intval($value); $processor = intval($value);
if ($key != '') if ($key != '')
......
...@@ -83,7 +83,7 @@ class cronjob_monitor_disk_usage extends cronjob { ...@@ -83,7 +83,7 @@ class cronjob_monitor_disk_usage extends cronjob {
* ignore the first line, process the rest * ignore the first line, process the rest
*/ */
for ($i = 1; $i <= sizeof($df); $i++) { for ($i = 1; $i <= sizeof($df); $i++) {
if ($df[$i] != '') { if (isset($df[$i]) && $df[$i] != '') {
/* /*
* Make an array of the data * Make an array of the data
*/ */
......
...@@ -78,7 +78,7 @@ class cronjob_monitor_hd_quota extends cronjob { ...@@ -78,7 +78,7 @@ class cronjob_monitor_hd_quota extends cronjob {
//* ignore the first 5 lines, process the rest //* ignore the first 5 lines, process the rest
for ($i = 5; $i <= sizeof($df); $i++) { for ($i = 5; $i <= sizeof($df); $i++) {
if ($df[$i] != '') { if (isset($df[$i]) && $df[$i] != '') {
//* Make a array of the data //* Make a array of the data
$s = preg_split('/[\s]+/', $df[$i]); $s = preg_split('/[\s]+/', $df[$i]);
$username = $s[0]; $username = $s[0];
...@@ -106,7 +106,7 @@ class cronjob_monitor_hd_quota extends cronjob { ...@@ -106,7 +106,7 @@ class cronjob_monitor_hd_quota extends cronjob {
//* ignore the first 5 lines, process the rest //* ignore the first 5 lines, process the rest
for ($i = 5; $i <= sizeof($df); $i++) { for ($i = 5; $i <= sizeof($df); $i++) {
if ($df[$i] != '') { if (isset($df[$i]) && $df[$i] != '') {
//* Make a array of the data //* Make a array of the data
$s = preg_split('/[\s]+/', $df[$i]); $s = preg_split('/[\s]+/', $df[$i]);
$groupname = $s[0]; $groupname = $s[0];
......
...@@ -89,8 +89,8 @@ class cronjob_monitor_mail_queue extends cronjob { ...@@ -89,8 +89,8 @@ class cronjob_monitor_mail_queue extends cronjob {
$tmp = explode("\n", $data['output']); $tmp = explode("\n", $data['output']);
$more = $tmp[sizeof($tmp) - 1]; $more = $tmp[sizeof($tmp) - 1];
$res = $this->_getIntArray($more); $res = $this->_getIntArray($more);
$data['bytes'] = $res[0]; $data['bytes'] = (isset($res[0]))?$res[0]:0;
$data['requests'] = $res[1]; $data['requests'] = (isset($res[1]))?$res[1]:0;
/** The state of the mailq. */ /** The state of the mailq. */
$state = 'ok'; $state = 'ok';
......
...@@ -78,7 +78,7 @@ class cronjob_monitor_mem_usage extends cronjob { ...@@ -78,7 +78,7 @@ class cronjob_monitor_mem_usage extends cronjob {
$key = trim($part[0]); $key = trim($part[0]);
$tmp = explode(' ', trim($part[1])); $tmp = explode(' ', trim($part[1]));
$value = 0; $value = 0;
if ($tmp[1] == 'kB') if (isset($tmp[1]) && $tmp[1] == 'kB')
$value = $tmp[0] * 1024; $value = $tmp[0] * 1024;
$data[$key] = $value; $data[$key] = $value;
} }
......
...@@ -152,7 +152,7 @@ abstract class ISPConfigDateTime { ...@@ -152,7 +152,7 @@ abstract class ISPConfigDateTime {
* - onlytime: HH:MM * - onlytime: HH:MM
* - rss: Rss time format for XML * - rss: Rss time format for XML
* - nice: if you prepend a nice: (like nice:long) you will get results like "today" or "yesterday" if applicable * - nice: if you prepend a nice: (like nice:long) you will get results like "today" or "yesterday" if applicable
* - custom: you can give a strftime format like %d.%m.%Y %H:%M if you prepend custom: to it * - custom: you can give a php date function format like d.m.Y H:i if you prepend custom: to it
* @param bool $time if true apped the time to the date string * @param bool $time if true apped the time to the date string
* @param bool $seconds if true append the seconds to the time * @param bool $seconds if true append the seconds to the time
* @return string date string * @return string date string
...@@ -174,15 +174,15 @@ abstract class ISPConfigDateTime { ...@@ -174,15 +174,15 @@ abstract class ISPConfigDateTime {
$fmt = ''; $fmt = '';
$prepend = ''; $prepend = '';
if(substr($format, 0, 5) == 'nice:') { if(substr($format, 0, 5) == 'nice:') {
if(strftime('%d.%m.%Y', $date) == strftime('%d.%m.%Y', $portal->getTime())) { if(date('d.m.Y', $date) == date('d.m.Y', $portal->getTime())) {
if($time == true) $format = 'onlytime'; if($time == true) $format = 'onlytime';
else $format = ''; else $format = '';
$prepend = 'Heute'; $prepend = 'Heute';
} elseif(strftime('%d.%m.%Y', $date) == strftime('%d.%m.%Y', $portal->getTime() - 86400)) { } elseif(date('d.m.Y', $date) == date('d.m.Y', $portal->getTime() - 86400)) {
if($time == true) $format = 'onlytime'; if($time == true) $format = 'onlytime';
else $format = ''; else $format = '';
$prepend = 'Gestern'; $prepend = 'Gestern';
} elseif(strftime('%d.%m.%Y', $date) == strftime('%d.%m.%Y', $portal->getTime() + 86400)) { } elseif(date('d.m.Y', $date) == date('d.m.Y', $portal->getTime() + 86400)) {
if($time == true) $format = 'onlytime'; if($time == true) $format = 'onlytime';
else $format = ''; else $format = '';
$prepend = 'Morgen'; $prepend = 'Morgen';
...@@ -195,21 +195,21 @@ abstract class ISPConfigDateTime { ...@@ -195,21 +195,21 @@ abstract class ISPConfigDateTime {
$time = false; $time = false;
} }
if($format == 'short') $fmt = '%d.%m.%y'; if($format == 'short') $fmt = 'd.m.y';
elseif($format == 'veryshort') $fmt = '%d.%m.'; elseif($format == 'veryshort') $fmt = 'd.m.';
elseif($format == 'medium') $fmt = '%d.%m.%Y'; elseif($format == 'medium') $fmt = 'd.m.Y';
elseif($format == 'long') $fmt = '%d. %B %Y'; elseif($format == 'long') $fmt = 'd. B Y';
elseif($format == 'extra') $fmt = '%A, %d. %B %Y'; elseif($format == 'extra') $fmt = 'A, d. B Y';
elseif($format == 'day') $fmt = '%d'; elseif($format == 'day') $fmt = 'd';
elseif($format == 'monthnum') $fmt = '%m'; elseif($format == 'monthnum') $fmt = 'm';
elseif($format == 'shortmonth') $fmt = '%b'; elseif($format == 'shortmonth') $fmt = 'b';
elseif($format == 'month') $fmt = '%B'; elseif($format == 'month') $fmt = 'B';
elseif($format == 'shortyear') $fmt = '%y'; elseif($format == 'shortyear') $fmt = 'y';
elseif($format == 'year') $fmt = '%Y'; elseif($format == 'year') $fmt = 'Y';
elseif($format == 'onlydate') $fmt = '%d.%m.'; elseif($format == 'onlydate') $fmt = 'd.m.';
elseif($format == 'onlydatelong') $fmt = '%d. %B'; elseif($format == 'onlydatelong') $fmt = 'd. B';
elseif($format == 'onlytime') { elseif($format == 'onlytime') {
$fmt = '%H:%M'; $fmt = 'H:i';
$time = false; $time = false;
} elseif($format == 'rss') { } elseif($format == 'rss') {
$ret = date(DATE_RSS, $date); $ret = date(DATE_RSS, $date);
...@@ -220,9 +220,9 @@ abstract class ISPConfigDateTime { ...@@ -220,9 +220,9 @@ abstract class ISPConfigDateTime {
if($prepend != '') $ret = $prepend . ' ' . $ret; if($prepend != '') $ret = $prepend . ' ' . $ret;
return $ret; return $ret;
} }
if($time == true) $fmt .= ' %H:%M' . ($seconds == true ? ':%S' : ''); if($time == true) $fmt .= ' H:i' . ($seconds == true ? ':s' : '');
if($fmt != '') $ret = strftime($fmt, $date); if($fmt != '') $ret = date($fmt, $date);
else $ret = ''; else $ret = '';
if($prepend != '') $ret = trim($prepend . ' ' . $ret); if($prepend != '') $ret = trim($prepend . ' ' . $ret);
...@@ -249,10 +249,10 @@ abstract class ISPConfigDateTime { ...@@ -249,10 +249,10 @@ abstract class ISPConfigDateTime {
* @return mixed either int (months) or array of int (0 => years, 1 => months) or FALSE on invalid dates * @return mixed either int (months) or array of int (0 => years, 1 => months) or FALSE on invalid dates
*/ */
public static function months_between($date_from, $date_to, $return_years = false, $include_both = false) { public static function months_between($date_from, $date_to, $return_years = false, $include_both = false) {
$date_from = self::to_string($date_from, 'custom:%Y%m'); $date_from = self::to_string($date_from, 'custom:Ym');
if($date_from === false) return $date_from; if($date_from === false) return $date_from;
$date_to = self::to_string($date_to, 'custom:%Y%m'); $date_to = self::to_string($date_to, 'custom:Ym');
if($date_to === false) return $date_to; if($date_to === false) return $date_to;
$date_from = intval($date_from); $date_from = intval($date_from);
...@@ -294,12 +294,12 @@ abstract class ISPConfigDateTime { ...@@ -294,12 +294,12 @@ abstract class ISPConfigDateTime {
* @return mixed either int (days) or FALSE on invalid dates * @return mixed either int (days) or FALSE on invalid dates
*/ */
public static function days_between($date_from, $date_to, $include_both = false) { public static function days_between($date_from, $date_to, $include_both = false) {
$date_from = self::to_string($date_from, 'custom:%Y-%m-%d'); $date_from = self::to_string($date_from, 'custom:Y-m-d');
if($date_from === false) return $date_from; if($date_from === false) return $date_from;
list($y, $m, $d) = explode('-', $date_from); list($y, $m, $d) = explode('-', $date_from);
$ts_from = mktime(0, 0, 0, $m, $d, $y); $ts_from = mktime(0, 0, 0, $m, $d, $y);
$date_to = self::to_string($date_to, 'custom:%Y-%m-%d'); $date_to = self::to_string($date_to, 'custom:Y-m-d');
if($date_to === false) return $date_to; if($date_to === false) return $date_to;
list($y, $m, $d) = explode('-', $date_to); list($y, $m, $d) = explode('-', $date_to);
$ts_to = mktime(0, 0, 0, $m, $d, $y); $ts_to = mktime(0, 0, 0, $m, $d, $y);
...@@ -364,7 +364,7 @@ abstract class ISPConfigDateTime { ...@@ -364,7 +364,7 @@ abstract class ISPConfigDateTime {
if($date === false) $date = $portal->getTime(true); if($date === false) $date = $portal->getTime(true);
if(is_numeric($date)) { if(is_numeric($date)) {
return $no_time ? strftime('%Y-%m-%d', $date) : strftime('%Y-%m-%d %H:%M:%S', $date); return $no_time ? date('Y-m-d', $date) : date('Y-m-d H:i:s', $date);
} }
if(preg_match('/^(.*)(\d{1,2}:\d{1,2}(:\d{1,2})?)(\D|$)/', $date, $matches)) { if(preg_match('/^(.*)(\d{1,2}:\d{1,2}(:\d{1,2})?)(\D|$)/', $date, $matches)) {
...@@ -473,7 +473,7 @@ abstract class ISPConfigDateTime { ...@@ -473,7 +473,7 @@ abstract class ISPConfigDateTime {
if($date === false) return $date; if($date === false) return $date;
list($year, $month, $day) = explode('-', $date); list($year, $month, $day) = explode('-', $date);
list($curyear, $curmonth, $curday) = explode('-', strftime('%Y-%m-%d', $portal->getTime())); list($curyear, $curmonth, $curday) = explode('-', date('Y-m-d', $portal->getTime()));
$year_diff = $curyear - $year; $year_diff = $curyear - $year;
$month_diff = $curmonth - $month; $month_diff = $curmonth - $month;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment