mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-28 16:50:07 +02:00
Code Issues Releases Wiki Activity

PHP8 Compatibility and code cleanup.

Browse Source
This commit is contained in:
Cameron
2020-12-08 12:21:12 -08:00
parent a094a8fb73
commit afaac88003
49 changed files with 264 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/auth.php
View File

@@ -117,7 +117,7 @@ else
if (e_AJAX_REQUEST)
{
require_once (e_HANDLER.'js_helper.php');
e_jshelper::sendAjaxError(403, ADLAN_86, ADLAN_87, true);
e_jshelper::sendAjaxError(403, ADLAN_86, ADLAN_87);
}
require_once(e_ADMIN.'boot.php');

2
e107_admin/banlist_export.php
View File

@@ -72,7 +72,7 @@ if ($error_string = do_export($filename, $type_list, $format_array, $use_separat
banlist_adminlog('06','File: '.$filename.'<br />'.$error_string);
function do_export($filename, $type_list='',$format_array, $sep = ',', $quot = '"')
function do_export($filename, $type_list='',$format_array=array(), $sep = ',', $quot = '"')
{
$sql = e107::getDb();
$export_text = '';

2
e107_admin/image.php
View File

@@ -2760,7 +2760,7 @@ class media_admin_ui extends e_admin_ui
$count = 0;
$prevType = '';
while (list($key, $image_name) = each($dirlist))
foreach($dirlist as $key=>$image_name)
{
//$users = IMALAN_21." | ";
$row = array('user_id' => '');

15
e107_admin/includes/classis.php
View File

@@ -15,21 +15,22 @@ if (!defined('e107_INIT')) { exit; }
$mes = e107::getMessage();
$buts = "";
$newarray = e107::getNav()->adminLinks('core');
while (list($key, $funcinfo) = each($newarray))
$newarray = e107::getNav()->adminLinks('core');
foreach($newarray as $key=>$funcinfo)
{
$buts .= e107::getNav()->renderAdminButton($funcinfo[0], $funcinfo[1], $funcinfo[2], $funcinfo[3], $funcinfo[6], "classis");
}
if($buts != "")
if(!empty($buts))
{
$text = "<div style='text-align:center'>
<table class='table'>";
$text .= $buts;
$text .= render_clean();
$text .= "</table></div>";
$ns->tablerender(ADLAN_47." ".ADMINNAME, $mes->render().$text);
e107::getRender()->tablerender(ADLAN_47." ".ADMINNAME, $mes->render().$text);
}
$text = "<div style='text-align:center'>
<table class='table'>";
@@ -39,6 +40,6 @@ $text .= render_clean();
$text .= "</table></div>";
$ns->tablerender(ADLAN_CL_7, $text,'infopanel');
e107::getRender()->tablerender(ADLAN_CL_7, $text,'infopanel');
?>

8
e107_admin/includes/combo.php
View File

@@ -19,7 +19,8 @@ $newarray = e107::getNav()->adminLinks('core');
$text = "<div style='text-align:center'>
<table class='table'>";
$buts = "";
while (list($key, $funcinfo) = each($newarray)) {
foreach($newarray as $key=>$funcinfo)
{
$buts .= e107::getNav()->renderAdminButton($funcinfo[0], $funcinfo[1], $funcinfo[2], $funcinfo[3], $funcinfo[5], 'default');
}
$text .= $buts;
@@ -29,8 +30,9 @@ while ($td <= 5) {
}
$td = 1;
$text .= "</tr></table></div>";
if($buts != ""){
$ns->tablerender(ADLAN_47." ".ADMINNAME, $mes->render().$text);
if(!empty($buts))
{
e107::getRender()->tablerender(ADLAN_47." ".ADMINNAME, $mes->render().$text);
}
$text = "<div style='text-align:center'>

13
e107_admin/includes/compact.php
View File

@@ -21,26 +21,28 @@ $newarray = e107::getNav()->adminLinks('core');
$buts = "";
$text = "<div style='text-align:center'>
<table class='table'>";
while (list($key, $funcinfo) = each($newarray))
foreach($newarray as $key=>$funcinfo)
{
$buts .= e107::getNav()->renderAdminButton($funcinfo[0], $funcinfo[1], $funcinfo[2], $funcinfo[3], $funcinfo[5], 'default');
}
$text .= $buts;
$text_cat = '';
$td = 0;
while ($td <= 5)
{
$text_cat .= "<td class='td' style='width:20%;' ></td>";
$td++;
}
$td = 1;
$text .= "</tr></table></div>";
if($buts !="")
if(!empty($buts))
{
$ns->tablerender(ADLAN_47." ".ADMINNAME, $mes->render().$text);
e107::getRender()->tablerender(ADLAN_47." ".ADMINNAME, $mes->render().$text);
}
$text = "<div style='text-align:center'>
@@ -53,8 +55,7 @@ $text .= e107::getNav()->pluginLinks( E_16_PLUGMANAGER, 'default');
$text .= "</tr>
</table></div>";
$ns->tablerender(ADLAN_CL_7, $text);
e107::getRender()->tablerender(ADLAN_CL_7, $text);
echo admin_info();
?>

2
e107_admin/users.php
View File

@@ -466,7 +466,7 @@ class users_admin_ui extends e_admin_ui
}
public function afterDelete($deletedData, $id=null, $deleted_check)
public function afterDelete($deletedData, $id, $deleted_check)
{
if(!empty($id))
{

18
e107_admin/users_extended.php
View File

@@ -2455,21 +2455,3 @@ class users_ext
}
}// end class
function users_extended_adminmenu() {
global $user, $action, $ns, $curtype, $action;
// $user->show_options($action);
$ac = e_QUERY;
$action = vartrue($ac,'main');
users_ext::show_options($action);
if($action == 'editext' || $action == 'continue')
{
$ns->tablerender(EXTLAN_46." - <span id='ue_type'>&nbsp;</span>", "<div id='ue_help'>&nbsp;</div>");
echo "<script type='text/javascript'>changeHelp('{$curtype}');</script>";
}
}
?>