makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-29 14:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14943] Fix template loop access by index

Browse source 
Allows inserting elements in a loop specified as 'outer[3].inner'.
This was coded, but malfunctioning.  Name incorrectly set on insert.
If block was empty, the insertion process should create it.
Checking for out of bounds indexes.

PHPBB3-14943
This commit is contained in:
javiexin 2017-01-12 21:25:39 +01:00
parent 76b3fbc006
commit d2ad751851
1 changed files with 39 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
phpBB/phpbb/template/context.php
View file

@ -293,47 +293,49 @@ class context
public function alter_block_array($blockname, array $vararray, $key = false, $mode = 'insert') public function alter_block_array($blockname, array $vararray, $key = false, $mode = 'insert')
{ {
$this->num_rows_is_set = false; $this->num_rows_is_set = false;
if (strpos($blockname, '.') !== false)
// For nested block, $blockcount > 0, for top-level block, $blockcount == 0
$blocks = explode('.', $blockname);
$blockcount = sizeof($blocks) - 1;
$block = &$this->tpldata;
for ($i = 0; $i < $blockcount; $i++)
{ {
// Nested block. if (($pos = strpos($blocks[$i], '[')) !== false)
$blocks = explode('.', $blockname);
$blockcount = sizeof($blocks) - 1;
$block = &$this->tpldata;
for ($i = 0; $i < $blockcount; $i++)
{ {
if (($pos = strpos($blocks[$i], '[')) !== false) $name = substr($blocks[$i], 0, $pos);
{
$name = substr($blocks[$i], 0, $pos);
if (strpos($blocks[$i], '[]') === $pos) if (strpos($blocks[$i], '[]') === $pos)
{ {
$index = sizeof($block[$name]) - 1; $index = sizeof($block[$name]) - 1;
}
else
{
$index = min((int) substr($blocks[$i], $pos + 1, -1), sizeof($block[$name]) - 1);
}
} }
else else
{ {
$name = $blocks[$i]; $index = min((int) substr($blocks[$i], $pos + 1, -1), sizeof($block[$name]) - 1);
$index = sizeof($block[$name]) - 1;
} }
$block = &$block[$name];
$block = &$block[$index];
} }
else
{
$name = $blocks[$i];
$index = sizeof($block[$name]) - 1;
}
$block = &$block[$name];
$block = &$block[$index];
}
$name = $blocks[$i];
$block = &$block[$blocks[$i]]; // Traverse the last block // If last block does not exist and we are inserting, and not searching for key, we create it empty; otherwise, nothing to do
$name = $blocks[$i]; if (!isset($block[$name]))
}
else
{ {
// Top-level block. if ($mode != 'insert' || is_array($key))
$block = &$this->tpldata[$blockname]; {
$name = $blockname; return false;
}
$block[$name] = array();
} }
$block = &$block[$name]; // Now we can traverse the last block
// Change key to zero (change first position) if false and to last position if true // Change key to zero (change first position) if false and to last position if true
if ($key === false || $key === true) if ($key === false || $key === true)
{ {
@ -373,8 +375,9 @@ class context
unset($block[($key - 1)]['S_LAST_ROW']); unset($block[($key - 1)]['S_LAST_ROW']);
$vararray['S_LAST_ROW'] = true; $vararray['S_LAST_ROW'] = true;
} }
else if ($key === 0) if ($key <= 0)
{ {
$key = 0;
unset($block[0]['S_FIRST_ROW']); unset($block[0]['S_FIRST_ROW']);
$vararray['S_FIRST_ROW'] = true; $vararray['S_FIRST_ROW'] = true;
} }
@ -400,6 +403,12 @@ class context
// Which block to change? // Which block to change?
if ($mode == 'change') if ($mode == 'change')
{ {
// If key is out of bounds, do not change anything
if ($key > sizeof($block) || $key < 0)
{
return false;
}
if ($key == sizeof($block)) if ($key == sizeof($block))
{ {
$key--; $key--;