diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-02-23 22:21:16 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-02-23 22:21:16 +0100 |
| commit | 9267235f30b3275b4b00f49f99c6ae259ce26a3f (patch) | |
| tree | b1b3d509f28f8fc578775d4e8da6553ff5a4859b /phpBB/phpbb/template/context.php | |
| parent | 4c3ddea09fa7975dec5180eff6d6947fb41e619a (diff) | |
| parent | d2ad751851c955c19d1688cbe511925489212121 (diff) | |
| download | forums-9267235f30b3275b4b00f49f99c6ae259ce26a3f.tar forums-9267235f30b3275b4b00f49f99c6ae259ce26a3f.tar.gz forums-9267235f30b3275b4b00f49f99c6ae259ce26a3f.tar.bz2 forums-9267235f30b3275b4b00f49f99c6ae259ce26a3f.tar.xz forums-9267235f30b3275b4b00f49f99c6ae259ce26a3f.zip | |
Merge pull request #4605 from javiexin/ticket/14943
[ticket/14943] Fix template loop access by index
Diffstat (limited to 'phpBB/phpbb/template/context.php')
| -rw-r--r-- | phpBB/phpbb/template/context.php | 69 |
1 files changed, 40 insertions, 29 deletions
diff --git a/phpBB/phpbb/template/context.php b/phpBB/phpbb/template/context.php index c7df29d62c..5d04a09865 100644 --- a/phpBB/phpbb/template/context.php +++ b/phpBB/phpbb/template/context.php @@ -376,45 +376,49 @@ class context public function alter_block_array($blockname, array $vararray, $key = false, $mode = 'insert') { $this->num_rows_is_set = false; - if (strpos($blockname, '.') !== false) - { - // Nested block. - $blocks = explode('.', $blockname); - $blockcount = sizeof($blocks) - 1; - $block = &$this->tpldata; - for ($i = 0; $i < $blockcount; $i++) + // 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++) + { + if (($pos = strpos($blocks[$i], '[')) !== false) { - if (($pos = strpos($blocks[$i], '[')) !== false) + $name = substr($blocks[$i], 0, $pos); + + if (strpos($blocks[$i], '[]') === $pos) { - $name = substr($blocks[$i], 0, $pos); - - if (strpos($blocks[$i], '[]') === $pos) - { - $index = sizeof($block[$name]) - 1; - } - else - { - $index = min((int) substr($blocks[$i], $pos + 1, -1), sizeof($block[$name]) - 1); - } + $index = sizeof($block[$name]) - 1; } else { - $name = $blocks[$i]; - $index = sizeof($block[$name]) - 1; + $index = min((int) substr($blocks[$i], $pos + 1, -1), sizeof($block[$name]) - 1); } - $block = &$block[$name]; - $block = &$block[$index]; } - - $block = &$block[$blocks[$i]]; // Traverse the last block + else + { + $name = $blocks[$i]; + $index = sizeof($block[$name]) - 1; + } + $block = &$block[$name]; + $block = &$block[$index]; } - else + $name = $blocks[$i]; + + // If last block does not exist and we are inserting, and not searching for key, we create it empty; otherwise, nothing to do + if (!isset($block[$name])) { - // Top-level block. - $block = &$this->tpldata[$blockname]; + if ($mode != 'insert' || is_array($key)) + { + 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 if ($key === false || $key === true) { @@ -454,14 +458,15 @@ class context unset($block[($key - 1)]['S_LAST_ROW']); $vararray['S_LAST_ROW'] = true; } - else if ($key === 0) + if ($key <= 0) { + $key = 0; unset($block[0]['S_FIRST_ROW']); $vararray['S_FIRST_ROW'] = true; } // Assign S_BLOCK_NAME - $vararray['S_BLOCK_NAME'] = $blockname; + $vararray['S_BLOCK_NAME'] = $name; // Re-position template blocks for ($i = sizeof($block); $i > $key; $i--) @@ -481,6 +486,12 @@ class context // Which block to 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)) { $key--; |