mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-11 17:14:42 +02:00
Code Issues Releases Wiki Activity

Fix all PHP 8.1 test failures

Browse Source 
* `strftime()` has been replaced with a polyfill based on `DateTime`.
* Explicit type casts/assertions added where required by PHP 8.1
* `filter_var(…, FILTER_SANITIZE_STRING)` replaced with `strip_tags()`
  or HTML entity encoding of quotation marks, depending on a guess of
  what the intended "sanitization" was
* `http_build_query()` usage type mismatches fixed
* Removed usages of the `FILE_TEXT` constant
* To avoid breaking PHP 5.6 compatibility (function return types),
  `e_session_db` no longer implements `SessionHandlerInterface`.
  Instead, the alternative non-OOP invocation of
  `session_set_save_handler()` is used instead to apply the session
  handler.
* The shim for `strptime()` still calls the native function if available
  but now suppresses the deprecation warning.

* `e_db_pdo` explicitly asks for `PDO::ATTR_STRINGIFY_FETCHES` to
  maintain consistent behavior with past versions of PHP.
* `e_db_mysql` explicitly sets `mysqli_report(MYSQLI_REPORT_OFF)` to
  maintain consistent behavior with past versions of PHP.

* Removed pointless random number generator seed from `banner` plugin
* Workaround for `COUNT(*)` SQL query in
  `validatorClass::dbValidateArray()` without a proper API for avoiding
  SQL injection
This commit is contained in:
Nick Liu
2021-09-04 15:06:19 +02:00
parent 64cd796605
commit 20882920a0
54 changed files with 295 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
e107_handlers/form_handler.php
View File

@@ -2745,7 +2745,7 @@ class e_form
if(!is_array($options))
{
parse_str($options, $options);
parse_str((string) $options, $options);
}
if(is_array($value))
@@ -2979,7 +2979,7 @@ class e_form
}
if(!is_array($options))
{
parse_str($options, $options);
parse_str((string) $options, $options);
}
if(!empty($options['help']))
@@ -3052,7 +3052,7 @@ class e_form
if(!is_array($options))
{
parse_str($options, $options);
parse_str((string) $options, $options);
}
@@ -3109,7 +3109,7 @@ class e_form
{
if(!is_array($options))
{
parse_str($options, $options);
parse_str((string) $options, $options);
}
if($option_array === 'yesno')
@@ -3712,6 +3712,7 @@ var_dump($select_options);*/
*/
public function admin_button($name, $value, $action = 'submit', $label = '', $options = array())
{
$action = (string) $action;
$btype = 'submit';
if(strpos($action, 'action') === 0 || $action === 'button')
{
@@ -3909,7 +3910,8 @@ var_dump($select_options);*/
//
foreach ($options as $option => $optval)
{
$optval = trim($optval);
$optval = trim((string) $optval);
$optval = htmlspecialchars($optval, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
switch ($option)
{
@@ -4384,14 +4386,15 @@ var_dump($select_options);*/
public function thead($fieldarray, $columnPref = array(), $querypattern = '', $requeststr = '')
{
$tp = e107::getParser();
$text = '';
$querypattern = filter_var($querypattern, FILTER_SANITIZE_STRING);
$querypattern = $tp->filter($querypattern, 'str');
if(!$requeststr)
{
$requeststr = rawurldecode(e_QUERY);
}
$requeststr = filter_var($requeststr, FILTER_SANITIZE_STRING);
$requeststr = $tp->filter($requeststr, 'str');
// Recommended pattern: mode=list&field=[FIELD]&asc=[ASC]&from=[FROM]
if(strpos($querypattern,'&')!==FALSE)
@@ -4787,7 +4790,7 @@ var_dump($select_options);*/
{
foreach($array as $k=>$v)
{
$jsonArray[$k] = str_replace("'", '`', $v);
$jsonArray[$k] = str_replace("'", '`', (string) $v);
}
}
@@ -4978,7 +4981,7 @@ var_dump($select_options);*/
$eModalCap .= " data-modal-submit='true'";
}
$query = http_build_query($query, null, '&');
$query = http_build_query($query, '', '&');
$text .= "<a href='".e_SELF."?{$query}' class='btn btn-default btn-secondary".$eModal."' ".$eModalCap." title='".LAN_EDIT."' data-toggle='tooltip' data-bs-toggle='tooltip' data-placement='left'>
".$editIconDefault. '</a>';
}
@@ -5226,10 +5229,11 @@ var_dump($select_options);*/
parse_str($attributes['writeParms'], $attributes['writeParms']);
}
$wparms = $attributes['writeParms'];
if(!is_array(varset($wparms['__options'])))
if (!isset($wparms['__options'])) $wparms['__options'] = null;
if(!is_array($wparms['__options']))
{
parse_str($wparms['__options'], $wparms['__options']);
parse_str((string) $wparms['__options'], $wparms['__options']);
}
if(!empty($wparms['optArray']))