mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-19 21:02:09 +02:00
Code Issues Releases Wiki Activity

Merge pull request #4554 from Deltik/php-8.1

Browse Source 
PHP 8.1 compatibility
This commit is contained in:
Cameron
2021-09-10 14:38:31 -07:00
committed by GitHub
parent 834c713eef 20882920a0
commit 3e52f29087
55 changed files with 648 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/admin_log.php
View File

@@ -371,7 +371,7 @@ class admin_log_ui extends e_admin_ui
if(($action == "backdel") && isset($_POST['backdeltype']))
{
// $old_date = intval($qs[1]);
$old_string = strftime("%d %B %Y", $old_date);
$old_string = e_date::strftime("%d %B %Y", $old_date);
$qry = "dblog_datestamp < ".$old_date; // Same field for both logs
switch($_POST['backdeltype'])

4
e107_admin/banlist_export.php
View File

@@ -65,7 +65,7 @@ if (!empty($_POST['ban_types']))
}
}
$filename = 'banlist_'.strftime("%Y%m%d_%H%M%S").'.csv';
$filename = 'banlist_'.e_date::strftime("%Y%m%d_%H%M%S").'.csv';
if ($error_string = do_export($filename, $type_list, $format_array, $use_separator, $use_quote))
{
@@ -98,7 +98,7 @@ function do_export($filename, $type_list='',$format_array=array(), $sep = ',', $
break;
case 'banlist_datestamp' :
case 'banlist_banexpires' :
if ($row[$f]) $line .= $spacer.$quot.strftime($v,$row[$f]).$quot; else $line .= $spacer.$quot.'0'.$quot;
if ($row[$f]) $line .= $spacer.$quot.e_date::strftime($v,$row[$f]).$quot; else $line .= $spacer.$quot.'0'.$quot;
break;
}
$spacer = $sep;

2
e107_admin/cpage.php
View File

@@ -141,7 +141,7 @@ class page_admin_form_ui extends e_admin_form_ui
parse_str(str_replace('&amp;', '&', e_QUERY), $query); //FIXME - FIX THIS
$query['action'] = 'edit';
$query['id'] = $id;
$query = http_build_query($query,null, '&amp;');
$query = http_build_query($query, '', '&amp;');
$text = "<a href='".e_SELF."?{$query}' class='btn btn-default' title='".LAN_EDIT."' data-toggle='tooltip' data-bs-toggle='tooltip' data-placement='left'>
".ADMIN_EDIT_ICON."</a>";

8
e107_admin/cron.php
View File

@@ -542,9 +542,9 @@ class cron_admin_form_ui extends e_admin_form_ui
$text .= "<br />";
$text .= ($day != '*') ? LAN_CRON_52 ." ". $day : LAN_CRON_40; // Day(s)
$text .= "<br />";
$text .= ($month != '*') ? LAN_CRON_53 ." ". strftime("%B", mktime(00, 00, 00, $month, 1, 2000)) : LAN_CRON_41; // Month(s)
$text .= ($month != '*') ? LAN_CRON_53 ." ". e_date::strftime("%B", mktime(00, 00, 00, (int) $month, 1, 2000)) : LAN_CRON_41; // Month(s)
$text .= "<br />";
$text .= ($weekday != '*') ? LAN_CRON_54 ." ". strftime("%A", mktime(00, 00, 00, 5, $weekday, 2000)) : LAN_CRON_42; // Weekday(s)
$text .= ($weekday != '*') ? LAN_CRON_54 ." ". e_date::strftime("%A", mktime(00, 00, 00, 5, (int) $weekday, 2000)) : LAN_CRON_42; // Weekday(s)
return "<a class='e-tip' href=''>".ADMIN_INFO_ICON."</a>
@@ -711,7 +711,7 @@ class cron_admin_form_ui extends e_admin_form_ui
{
$sel = (in_array($i, $month)) ? "selected='selected'" : "";
$diz = mktime(00, 00, 00, $i, 1, 2000);
$text .= "<option value='$i' $sel>".strftime("%B", $diz)."</option>\n";
$text .= "<option value='$i' $sel>".e_date::strftime("%B", $diz)."</option>\n";
}
$text .= "</select>
@@ -724,7 +724,7 @@ class cron_admin_form_ui extends e_admin_form_ui
for ($i = 0; $i <= 6; $i++)
{
$sel = (in_array(strval($i), $weekday)) ? "selected='selected'" : "";
$text .= "<option value='$i' $sel>".strftime("%A", mktime(00, 00, 00, 5, $i, 2000))."</option>\n";
$text .= "<option value='$i' $sel>".e_date::strftime("%A", mktime(00, 00, 00, 5, $i, 2000))."</option>\n";
}
$text .= "</select>
";

2
e107_admin/image.php
View File

@@ -672,7 +672,7 @@ class media_form_ui extends e_admin_form_ui
// $save = ($_GET['bbcode']!='file') ? "e-dialog-save" : "";
// e-dialog-close
$for = $this->getController()->getQuery('for');
$for = (string) $this->getController()->getQuery('for');

44
e107_admin/prefs.php
View File

@@ -787,26 +787,26 @@ $text .= "
$def = strtotime('December 21, 2012 3:45pm');
$inputdate = array( // TODO add more formats
"%A, %d %B, %Y" => strftime("%A, %d %B, %Y",$def),
"%A, %d %b, %Y" => strftime("%A, %d %b, %Y",$def),
"%a, %d %B, %Y" => strftime("%a, %d %B, %Y",$def),
"%a, %d %b, %Y" => strftime("%a, %d %b, %Y",$def),
"%A, %d %B, %Y" => e_date::strftime("%A, %d %B, %Y",$def),
"%A, %d %b, %Y" => e_date::strftime("%A, %d %b, %Y",$def),
"%a, %d %B, %Y" => e_date::strftime("%a, %d %B, %Y",$def),
"%a, %d %b, %Y" => e_date::strftime("%a, %d %b, %Y",$def),
"%A, %B %d, %Y" => strftime("%A, %B %d, %Y",$def),
"%A, %b %d, %Y" => strftime("%A, %b %d, %Y",$def),
"%A, %b %d, %y" => strftime("%A, %b %d, %y",$def),
"%A, %B %d, %Y" => e_date::strftime("%A, %B %d, %Y",$def),
"%A, %b %d, %Y" => e_date::strftime("%A, %b %d, %Y",$def),
"%A, %b %d, %y" => e_date::strftime("%A, %b %d, %y",$def),
"%B %d, %Y" => strftime("%B %d, %Y",$def),
"%b %d, %Y" => strftime("%b %d, %Y",$def),
"%b %d, %y" => strftime("%b %d, %y",$def),
"%B %d, %Y" => e_date::strftime("%B %d, %Y",$def),
"%b %d, %Y" => e_date::strftime("%b %d, %Y",$def),
"%b %d, %y" => e_date::strftime("%b %d, %y",$def),
"%d %B, %Y" => strftime("%d %B, %Y",$def),
"%d %b, %Y" => strftime("%d %b, %Y",$def),
"%d %b, %y" => strftime("%d %b, %y",$def),
"%d %B, %Y" => e_date::strftime("%d %B, %Y",$def),
"%d %b, %Y" => e_date::strftime("%d %b, %Y",$def),
"%d %b, %y" => e_date::strftime("%d %b, %y",$def),
"%Y-%m-%d" => strftime("%Y-%m-%d",$def),
"%d-%m-%Y" => strftime("%d-%m-%Y",$def),
"%m/%d/%Y" => strftime("%m/%d/%Y",$def)
"%Y-%m-%d" => e_date::strftime("%Y-%m-%d",$def),
"%d-%m-%Y" => e_date::strftime("%d-%m-%Y",$def),
"%m/%d/%Y" => e_date::strftime("%m/%d/%Y",$def)
);
@@ -815,19 +815,19 @@ $text .= "
$inputtime["%I:%M %p"] = strftime("%I:%M %p",$def);
$inputtime["%I:%M %p"] = e_date::strftime("%I:%M %p",$def);
if(e107::getDate()->supported('P'))
{
$inputtime["%I:%M %P"] = strftime("%I:%M %P",$def);
$inputtime["%I:%M %P"] = e_date::strftime("%I:%M %P",$def);
}
if(e107::getDate()->supported('l'))
{
$inputtime["%l:%M %p"] = strftime("%l:%M %p",$def);
$inputtime["%l:%M %P"] = strftime("%l:%M %P",$def);
$inputtime["%l:%M %p"] = e_date::strftime("%l:%M %p",$def);
$inputtime["%l:%M %P"] = e_date::strftime("%l:%M %P",$def);
}
$inputtime["%H:%M"] = strftime("%H:%M",$def);
$inputtime["%H:%M:%S"] = strftime("%H:%M:%S",$def);
$inputtime["%H:%M"] = e_date::strftime("%H:%M",$def);
$inputtime["%H:%M:%S"] = e_date::strftime("%H:%M:%S",$def);

2
e107_admin/users.php
View File

@@ -2410,7 +2410,7 @@ class users_admin_form_ui extends e_admin_form_ui
$att['type'] = 'boolean';
// $uid = $this->getController()->getModel()->get('user_id');
$perms = $this->getController()->getModel()->get('user_perms');
$perms = (string) $this->getController()->getModel()->get('user_perms');
if($mode == 'filter' && getperms('3'))
{