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

Fixes batch process issue under PHP 7.3

Browse Source
This commit is contained in:
Cameron
2019-03-03 13:08:02 -08:00
parent 4e07b87e37
commit 037c7c67ff
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
e107_handlers/admin_ui.php
View File

@ -3093,7 +3093,7 @@ class e_admin_controller_ui extends e_admin_controller
$tree->setTree($arr,true); // set the newly ordered tree. $tree->setTree($arr,true); // set the newly ordered tree.
var_dump($arr); // var_dump($arr);
return $this->_tree_model; return $this->_tree_model;
} }
@ -3307,15 +3307,16 @@ class e_admin_controller_ui extends e_admin_controller
return $this; return $this;
} }
} }
if($selected) if($selected)
{ {
foreach ($selected as $i => $_sel) foreach ($selected as $i => $_sel)
{ {
$selected[$i] = preg_replace('/[^\w-:.]/', '', $_sel); $selected[$i] = (int) $_sel; // preg_replace('/[^\w-:.]/', '', $_sel); // php 7.3 doesn't like this.
} }
} }
if(substr($batch_trigger, 0, 6) === 'batch_') if(substr($batch_trigger, 0, 6) === 'batch_')
{ {
list($tmp,$plugin,$command) = explode("_",$batch_trigger,3); list($tmp,$plugin,$command) = explode("_",$batch_trigger,3);
@ -3471,7 +3472,8 @@ class e_admin_controller_ui extends e_admin_controller
$this->handleCommaBatch($selected, $field, array_keys($classes), $trigger[0] === 'ucdelall' ? 'clearAll' : 'addAll'); $this->handleCommaBatch($selected, $field, array_keys($classes), $trigger[0] === 'ucdelall' ? 'clearAll' : 'addAll');
} }
break; break;
// handleListCopyBatch etc.
default: default:
$field = $trigger[0]; $field = $trigger[0];
$value = $trigger[1]; $value = $trigger[1];

9
e107_handlers/model_class.php
View File

@ -3980,6 +3980,14 @@ class e_admin_tree_model extends e_front_tree_model
*/ */
public function copy($ids, $session_messages = false) public function copy($ids, $session_messages = false)
{ {
if(empty($ids[0]))
{
$this->addMessageError('No IDs provided', $session_messages); //TODO - Lan
$this->addMessageDebug(print_a(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS),true),$session_messages); //TODO - Lan
return false;
}
$tp = e107::getParser(); $tp = e107::getParser();
$ids = array_map(array($tp, 'toDB'), $ids); $ids = array_map(array($tp, 'toDB'), $ids);
$idstr = implode(', ', $ids); $idstr = implode(', ', $ids);
@ -3996,6 +4004,7 @@ class e_admin_tree_model extends e_front_tree_model
{ {
$this->addMessageError('SQL Copy Error', $session_messages); //TODO - Lan $this->addMessageError('SQL Copy Error', $session_messages); //TODO - Lan
$this->addMessageDebug('SQL Error #'.$sql->getLastErrorNumber().': '.$sql->getLastErrorText()); $this->addMessageDebug('SQL Error #'.$sql->getLastErrorNumber().': '.$sql->getLastErrorText());
$this->addMessageDebug('$SQL Query'.print_a($sql->getLastQuery(),true));
} }
} }
$this->_db_errno = $sql->getLastErrorNumber(); $this->_db_errno = $sql->getLastErrorNumber();