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

Mod-security doesn't like '+' in queries. Debug query now uses '!'

Browse Source
This commit is contained in:
Cameron
2020-12-22 15:17:29 -08:00
parent 402d1f4126
commit 3c57f3fa96
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -785,11 +785,11 @@ class admin_shortcodes
$after = ''; $after = '';
} }
$link = $before."?[debug=".$var."+]".$after; $link = $before."?[debug=".$var."!]".$after;
} }
else else
{ {
$link = e_REQUEST_URI."?[debug=".$var."+]"; $link = e_REQUEST_URI."?[debug=".$var."!]";
} }
if(in_array($var,$dividerBefore)) if(in_array($var,$dividerBefore))

8
e107_handlers/debug_handler.php
View File

@@ -100,7 +100,7 @@ class e107_debug {
if(deftrue('e_MENU')) if(deftrue('e_MENU'))
{ {
list($tmp,$alias) = explode('=', e_MENU); list($tmp,$alias) = explode('=', e_MENU);
return str_replace(['+','-', '0', '1'],'',$alias); return str_replace(['!','+','-', '0', '1'],'',$alias);
} }
if(empty($_COOKIE['e107_debug_level'])) if(empty($_COOKIE['e107_debug_level']))
@@ -140,7 +140,7 @@ class e107_debug {
return false; return false;
} }
if (preg_match('/debug(=?)(.*?),?(\+|stick|-|unstick|$)/', e_MENU, $debug_param) || isset($_COOKIE['e107_debug_level'])) if (preg_match('/debug(=?)(.*?),?(!|\+|stick|-|unstick|$)/', e_MENU, $debug_param) || isset($_COOKIE['e107_debug_level']))
{ {
$dVals = ''; $dVals = '';
if (!isset($debug_param[1]) || ($debug_param[1] == '')) $debug_param[1] = '='; if (!isset($debug_param[1]) || ($debug_param[1] == '')) $debug_param[1] = '=';
@@ -149,7 +149,7 @@ class e107_debug {
$dVals = substr($_COOKIE['e107_debug_level'], 6); $dVals = substr($_COOKIE['e107_debug_level'], 6);
} }
if (preg_match('/debug(=?)(.*?),?(\+|stick|-|unstick|$)/', e_MENU)) if (preg_match('/debug(=?)(.*?),?(!|\+|stick|-|unstick|$)/', e_MENU))
{ {
$dVals = $debug_param[1] == '=' ? $debug_param[2] : 'everything'; $dVals = $debug_param[1] == '=' ? $debug_param[2] : 'everything';
} }
@@ -172,7 +172,7 @@ class e107_debug {
if (isset($debug_param[3])) if (isset($debug_param[3]))
{ {
if ($debug_param[3] == '+' || $debug_param[3] == 'stick') if ($debug_param[3] == '!' || $debug_param[3] == '+' || $debug_param[3] == 'stick')
{ {
cookie('e107_debug_level', 'level=' . $dVal, time() + 86400); cookie('e107_debug_level', 'level=' . $dVal, time() + 86400);
} }

2
install.php
View File

@@ -256,7 +256,7 @@ if(isset($_POST['previous_steps']))
$tmp = unserialize(base64_decode($_POST['previous_steps'])); $tmp = unserialize(base64_decode($_POST['previous_steps']));
// Save unfiltered admin password (#4004) - " are transformed into " // Save unfiltered admin password (#4004) - " are transformed into "
$tmpadminpass1 = $tmp['admin']['password']; $tmpadminpass1 = !empty($tmp['admin']['password']) ? $tmp['admin']['password'] : '';
$tmp = filter_var_array($tmp, FILTER_SANITIZE_STRING); $tmp = filter_var_array($tmp, FILTER_SANITIZE_STRING);