mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 12:20:44 +02:00
Code Issues Releases Wiki Activity

More PHP 8.1 fixes.

Browse Source
This commit is contained in:
Cameron
2021-11-26 12:36:25 -08:00
parent 5810f8148d
commit 2c9afc83ee
16 changed files with 48 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_admin/auth.php
View File

@@ -86,7 +86,7 @@ if (ADMIN)
$asuser = e107::getSystemUser(e107::getUser()->getSessionDataAs(), false);
$lanVars = array ('x' => ($asuser->getId() ? $asuser->getName().' ('.$asuser->getValue('email').')' : 'unknown')) ;
e107::getMessage()->addInfo($tp->lanVars(ADLAN_164, $lanVars).' <a href="'.e_ADMIN_ABS.'users.php?mode=main&amp;action=logoutas">['.LAN_LOGOUT.']</a>');
e107::getMessage()->addInfo(e107::getParser()->lanVars(ADLAN_164, $lanVars).' <a href="'.e_ADMIN_ABS.'users.php?mode=main&amp;action=logoutas">['.LAN_LOGOUT.']</a>');
}
// NEW, legacy 3rd party code fix, header called inside the footer o.O
@@ -133,7 +133,7 @@ else
else
{
e107::coreLan('log_messages', true);
e107::getLog()->addEvent(4, __FILE__."|".__FUNCTION__."@".__LINE__, "LOGIN", LAN_ROLL_LOG_11, "U: ".$tp->toDB($_POST['authname']), FALSE, LOG_TO_ROLLING);
e107::getLog()->addEvent(4, __FILE__."|".__FUNCTION__."@".__LINE__, "LOGIN", LAN_ROLL_LOG_11, "U: ".e107::getParser()->toDB($_POST['authname']), FALSE, LOG_TO_ROLLING);
e107::getRedirect()->redirect('admin.php?failed');
}

1
e107_admin/boot.php
View File

@@ -107,6 +107,7 @@ if(e_AJAX_REQUEST && ADMIN && varset($_GET['mode']) == 'core' && ($_GET['type']
$text = '<div style="margin-left:10px;margin-top:10px">';
$count = 1;
$tp = e107::getParser();
foreach($rows['channel']['item'] as $row)
{
if($count > $limit){ break; }

2
e107_admin/db.php
View File

@@ -929,6 +929,8 @@ class system_tools
$mes = e107::getMessage();
$sql = e107::getDb('utf8-convert');
$qry = [];
if($sql->gen($query))
{

24
e107_admin/users_extended.php
View File

@@ -39,13 +39,13 @@ if(varset($_GET['mode']) == "ajax")
{
$tmp = explode(".", e_QUERY);
$action = $tp->filter($tmp[0]);
$sub_action = varset($tmp[1], '');
$sub_action = varset($tmp[1]);
$sub_action = $tp->filter($sub_action);
$id = varset($tmp[2], 0);
unset($tmp);
}
if($sql->select('user_extended_struct', '*', "user_extended_struct_id = '{$sub_action}'"))
if($sql->select('user_extended_struct', '*', "user_extended_struct_id = '$sub_action'"))
{
$current = $sql->fetch();
}
@@ -68,7 +68,7 @@ if(varset($_GET['mode']) == "ajax")
foreach($result as $row2)
{
$fld = $row2;
$selected = (varset($_POST['table_db'], '') == $fld || $curVals[0] == $fld) ? " selected='selected'" : "";
$selected = (varset($_POST['table_db']) == $fld || $curVals[0] == $fld) ? " selected='selected'" : "";
$text .= "<option value=\"" . $fld . "\" $selected>" . $fld . "</option>\n";
}
$text .= "</select></td></tr>";
@@ -79,8 +79,8 @@ if(varset($_GET['mode']) == "ajax")
$text .= "<tr><td>" . EXTLAN_63 . "</td><td>";
$text .= "<select style='width:99%' class='tbox e-select' name='field_id'>";
$text .= "<option value='' class='caption'>" . LAN_NONE . "</option>";
$table_list = ($_POST['table_db']) ? $_POST['table_db'] : $curVals[0];
if($sql->gen("DESCRIBE " . MPREFIX . "{$table_list}"))
$table_list = !empty($_POST['table_db']) ? $_POST['table_db'] : $curVals[0];
if($sql->gen("DESCRIBE " . MPREFIX . $table_list))
{
while($row3 = $sql->fetch())
{
@@ -95,7 +95,7 @@ if(varset($_GET['mode']) == "ajax")
$text .= EXTLAN_64 . "</td><td>";
$text .= "<select style='width:99%' class='tbox e-select' name='field_value'>";
$text .= "<option value='' class='caption'>" . LAN_NONE . "</option>";
$table_list = ($_POST['table_db']) ? $_POST['table_db'] : $curVals[0];
$table_list = !empty($_POST['table_db']) ? $_POST['table_db'] : $curVals[0];
if($sql->gen("DESCRIBE " . MPREFIX . "{$table_list}"))
{
while($row3 = $sql->fetch())
@@ -111,7 +111,7 @@ if(varset($_GET['mode']) == "ajax")
$text .= LAN_ORDER . "</td><td>";
$text .= "<select style='width:99%' class='tbox e-select' name='field_order'>";
$text .= "<option value='' class='caption'>" . LAN_NONE . "</option>";
$table_list = ($_POST['table_db']) ? $_POST['table_db'] : $curVals[0];
$table_list = !empty($_POST['table_db']) ? $_POST['table_db'] : $curVals[0];
if($sql->gen("DESCRIBE " . MPREFIX . "{$table_list}"))
{
while($row3 = $sql->fetch())
@@ -930,7 +930,7 @@ e107::js('footer-inline', js());
$field['type'] = 'text';
$field['writeParms'] = $att;
$field['pattern'] = '[0-9a-z_]*';
return $this->renderElement('user_extended_struct_name', $curVal, $field);
break;
@@ -1037,7 +1037,7 @@ e107::js('footer-inline', js());
foreach($result as $row2)
{
$fld = $row2;
$selected = (varset($_POST['table_db'],'') == $fld || $curVals[0] == $fld) ? " selected='selected'" : "";
$selected = (varset($_POST['table_db']) == $fld || $curVals[0] == $fld) ? " selected='selected'" : "";
// if (MPREFIX!='' && strpos($row2[0], MPREFIX)!==FALSE)
{
$text .= "<option value=\"".$fld."\" $selected>".$fld."</option>\n";
@@ -1050,7 +1050,7 @@ e107::js('footer-inline', js());
// Field ID
$text .= "<tr><td>".EXTLAN_63."</td><td><select style='width:99%' class='tbox e-select' name='field_id' >\n
<option value='' class='caption'>".LAN_NONE."</option>\n";
$table_list = ($_POST['table_db']) ? $_POST['table_db'] : $curVals[0] ;
$table_list = !empty($_POST['table_db']) ? $_POST['table_db'] : $curVals[0] ;
if($sql->gen("DESCRIBE ".MPREFIX."{$table_list}"))
{
@@ -1065,7 +1065,7 @@ e107::js('footer-inline', js());
// Field Value
$text .= EXTLAN_64."</td><td><select style='width:99%' class='tbox e-select' name='field_value' >
<option value='' class='caption'>".LAN_NONE."</option>\n";
$table_list = ($_POST['table_db']) ? $_POST['table_db'] : $curVals[0] ;
$table_list = !empty($_POST['table_db']) ? $_POST['table_db'] : $curVals[0] ;
if($sql->gen("DESCRIBE ".MPREFIX."{$table_list}"))
{
@@ -1080,7 +1080,7 @@ e107::js('footer-inline', js());
$text .= LAN_ORDER."</td><td><select style='width:99%' class='tbox e-select' name='field_order' >
<option value='' class='caption'>".LAN_NONE."</option>\n";
$table_list = ($_POST['table_db']) ? $_POST['table_db'] : $curVals[0] ;
$table_list = !empty($_POST['table_db']) ? $_POST['table_db'] : $curVals[0] ;
if($sql ->gen("DESCRIBE ".MPREFIX."{$table_list}"))
{