Merge branch '3.2.x' into ticket/16159

author: stevendegroote <stevendegroote@gmail.com> 2019-09-17 23:15:54 +0200
committer: stevendegroote <stevendegroote@gmail.com> 2019-09-17 23:15:54 +0200
commit: f8967fec78d826ea8d9ca34f65966ff8a7674b47 (patch)
tree: f9c5f408e7764ec6343e084e7fc6d62d07e3400f /phpBB/phpbb/template/context.php
parent: ce93b224107a65b43253c36812b636321eb55a78 (diff)
parent: 4db585a4cb2e5359074a82ef088574609155294b (diff)
download: forums-f8967fec78d826ea8d9ca34f65966ff8a7674b47.tar
forums-f8967fec78d826ea8d9ca34f65966ff8a7674b47.tar.gz
forums-f8967fec78d826ea8d9ca34f65966ff8a7674b47.tar.bz2
forums-f8967fec78d826ea8d9ca34f65966ff8a7674b47.tar.xz
forums-f8967fec78d826ea8d9ca34f65966ff8a7674b47.zip
1 files changed, 78 insertions, 100 deletions
diff --git a/phpBB/phpbb/template/context.php b/phpBB/phpbb/template/context.php
index 392efd5933..202e29ce00 100644
--- a/phpBB/phpbb/template/context.php
+++ b/phpBB/phpbb/template/context.php
@@ -142,7 +142,7 @@ class context
 	*/
 	protected function set_num_rows(&$loop_data)
 	{
-		$s_num_rows = sizeof($loop_data);
+		$s_num_rows = count($loop_data);
 		foreach ($loop_data as &$mod_block)
 		{
 			foreach ($mod_block as $sub_block_name => &$sub_block)
@@ -190,70 +190,51 @@ class context
 	public function assign_block_vars($blockname, array $vararray)
 	{
 		$this->num_rows_is_set = false;
-		if (strpos($blockname, '.') !== false)
-		{
-			// Nested block.
-			$blocks = explode('.', $blockname);
-			$blockcount = sizeof($blocks) - 1;
-
-			$str = &$this->tpldata;
-			for ($i = 0; $i < $blockcount; $i++)
-			{
-				$str = &$str[$blocks[$i]];
-				$str = &$str[sizeof($str) - 1];
-			}
 
-			$s_row_count = isset($str[$blocks[$blockcount]]) ? sizeof($str[$blocks[$blockcount]]) : 0;
-			$vararray['S_ROW_COUNT'] = $vararray['S_ROW_NUM'] = $s_row_count;
+		// For nested block, $blockcount > 0, for top-level block, $blockcount == 0
+		$blocks = explode('.', $blockname);
+		$blockcount = count($blocks) - 1;
 
-			// Assign S_FIRST_ROW
-			if (!$s_row_count)
-			{
-				$vararray['S_FIRST_ROW'] = true;
-			}
+		$block = &$this->tpldata;
+		for ($i = 0; $i < $blockcount; $i++)
+		{
+			$pos = strpos($blocks[$i], '[');
+			$name = ($pos !== false) ? substr($blocks[$i], 0, $pos) : $blocks[$i];
+			$block = &$block[$name];
+			$block_count = empty($block) ? 0 : count($block) - 1;
+			$index = (!$pos || strpos($blocks[$i], '[]') === $pos) ? $block_count : (min((int) substr($blocks[$i], $pos + 1, -1), $block_count));
+			$block = &$block[$index];
+		}
 
-			// Assign S_BLOCK_NAME
-			$vararray['S_BLOCK_NAME'] = $blocks[$blockcount];
+		// $block = &$block[$blocks[$i]]; // Do not traverse the last block as it might be empty
+		$name = $blocks[$i];
 
-			// Now the tricky part, we always assign S_LAST_ROW and remove the entry before
-			// This is much more clever than going through the complete template data on display (phew)
-			$vararray['S_LAST_ROW'] = true;
-			if ($s_row_count > 0)
-			{
-				unset($str[$blocks[$blockcount]][($s_row_count - 1)]['S_LAST_ROW']);
-			}
+		// Assign S_ROW_COUNT and S_ROW_NUM
+		$s_row_count = isset($block[$name]) ? count($block[$name]) : 0;
+		$vararray['S_ROW_COUNT'] = $vararray['S_ROW_NUM'] = $s_row_count;
 
-			// Now we add the block that we're actually assigning to.
-			// We're adding a new iteration to this block with the given
-			// variable assignments.
-			$str[$blocks[$blockcount]][] = $vararray;
-		}
-		else
+		// Assign S_FIRST_ROW
+		if (!$s_row_count)
 		{
-			// Top-level block.
-			$s_row_count = (isset($this->tpldata[$blockname])) ? sizeof($this->tpldata[$blockname]) : 0;
-			$vararray['S_ROW_COUNT'] = $vararray['S_ROW_NUM'] = $s_row_count;
-
-			// Assign S_FIRST_ROW
-			if (!$s_row_count)
-			{
-				$vararray['S_FIRST_ROW'] = true;
-			}
-
-			// Assign S_BLOCK_NAME
-			$vararray['S_BLOCK_NAME'] = $blockname;
+			$vararray['S_FIRST_ROW'] = true;
+		}
 
-			// We always assign S_LAST_ROW and remove the entry before
-			$vararray['S_LAST_ROW'] = true;
-			if ($s_row_count > 0)
-			{
-				unset($this->tpldata[$blockname][($s_row_count - 1)]['S_LAST_ROW']);
-			}
+		// Assign S_BLOCK_NAME
+		$vararray['S_BLOCK_NAME'] = $name;
 
-			// Add a new iteration to this block with the variable assignments we were given.
-			$this->tpldata[$blockname][] = $vararray;
+		// Now the tricky part, we always assign S_LAST_ROW and remove the entry before
+		// This is much more clever than going through the complete template data on display (phew)
+		$vararray['S_LAST_ROW'] = true;
+		if ($s_row_count > 0)
+		{
+			unset($block[$name][($s_row_count - 1)]['S_LAST_ROW']);
 		}
 
+		// Now we add the block that we're actually assigning to.
+		// We're adding a new iteration to this block with the given
+		// variable assignments.
+		$block[$name][] = $vararray;
+
 		return true;
 	}
 
@@ -285,7 +266,7 @@ class context
 	{
 		// For nested block, $blockcount > 0, for top-level block, $blockcount == 0
 		$blocks = explode('.', $blockname);
-		$blockcount = sizeof($blocks) - 1;
+		$blockcount = count($blocks) - 1;
 
 		$block = $this->tpldata;
 		for ($i = 0; $i <= $blockcount; $i++)
@@ -294,19 +275,29 @@ class context
 			{
 				$name = substr($blocks[$i], 0, $pos);
 
+				if (empty($block[$name]))
+				{
+					return array();
+				}
+
 				if (strpos($blocks[$i], '[]') === $pos)
 				{
-					$index = sizeof($block[$name]) - 1;
+					$index = count($block[$name]) - 1;
 				}
 				else
 				{
-					$index = min((int) substr($blocks[$i], $pos + 1, -1), sizeof($block[$name]) - 1);
+					$index = min((int) substr($blocks[$i], $pos + 1, -1), count($block[$name]) - 1);
 				}
 			}
 			else
 			{
 				$name = $blocks[$i];
-				$index = sizeof($block[$name]) - 1;
+				if (empty($block[$name]))
+				{
+					return array();
+				}
+
+				$index = count($block[$name]) - 1;
 			}
 			$block = $block[$name];
 			$block = $block[$index];
@@ -355,39 +346,26 @@ class context
 	{
 		// For nested block, $blockcount > 0, for top-level block, $blockcount == 0
 		$blocks = explode('.', $blockname);
-		$blockcount = sizeof($blocks) - 1;
+		$blockcount = count($blocks) - 1;
 
 		$block = $this->tpldata;
 		for ($i = 0; $i < $blockcount; $i++)
 		{
-			if (($pos = strpos($blocks[$i], '[')) !== false)
-			{
-				$name = substr($blocks[$i], 0, $pos);
+			$pos = strpos($blocks[$i], '[');
+			$name = ($pos !== false) ? substr($blocks[$i], 0, $pos) : $blocks[$i];
 
-				if (strpos($blocks[$i], '[]') === $pos)
-				{
-					$index = sizeof($block[$name]) - 1;
-				}
-				else
-				{
-					$index = min((int) substr($blocks[$i], $pos + 1, -1), sizeof($block[$name]) - 1);
-				}
-			}
-			else
-			{
-				$name = $blocks[$i];
-				$index = sizeof($block[$name]) - 1;
-			}
 			if (!isset($block[$name]))
 			{
 				return false;
 			}
-			$block = $block[$name];
-			if (!isset($block[$index]))
+
+			$index = (!$pos || strpos($blocks[$i], '[]') === $pos) ? (count($block[$name]) - 1) : (min((int) substr($blocks[$i], $pos + 1, -1), count($block[$name]) - 1));
+
+			if (!isset($block[$name][$index]))
 			{
 				return false;
 			}
-			$block = $block[$index];
+			$block = $block[$name][$index];
 		}
 
 		if (!isset($block[$blocks[$i]]))
@@ -397,9 +375,9 @@ class context
 		$block = $block[$blocks[$i]]; // Traverse the last block
 
 		// Change key to zero (change first position) if false and to last position if true
-		if ($key === false || $key === true)
+		if (is_bool($key))
 		{
-			return ($key === false) ? 0 : sizeof($block) - 1;
+			return (!$key) ? 0 : count($block) - 1;
 		}
 
 		// Get correct position if array given
@@ -416,7 +394,7 @@ class context
 			}
 		}
 
-		return (is_int($key) && ((0 <= $key) && ($key < sizeof($block)))) ? $key : false;
+		return (is_int($key) && ((0 <= $key) && ($key < count($block)))) ? $key : false;
 	}
 
 	/**
@@ -453,7 +431,7 @@ class context
 
 		// For nested block, $blockcount > 0, for top-level block, $blockcount == 0
 		$blocks = explode('.', $blockname);
-		$blockcount = sizeof($blocks) - 1;
+		$blockcount = count($blocks) - 1;
 
 		$block = &$this->tpldata;
 		for ($i = 0; $i < $blockcount; $i++)
@@ -464,17 +442,17 @@ class context
 
 				if (strpos($blocks[$i], '[]') === $pos)
 				{
-					$index = sizeof($block[$name]) - 1;
+					$index = count($block[$name]) - 1;
 				}
 				else
 				{
-					$index = min((int) substr($blocks[$i], $pos + 1, -1), sizeof($block[$name]) - 1);
+					$index = min((int) substr($blocks[$i], $pos + 1, -1), count($block[$name]) - 1);
 				}
 			}
 			else
 			{
 				$name = $blocks[$i];
-				$index = sizeof($block[$name]) - 1;
+				$index = count($block[$name]) - 1;
 			}
 			$block = &$block[$name];
 			$block = &$block[$index];
@@ -496,7 +474,7 @@ class context
 		// Change key to zero (change first position) if false and to last position if true
 		if ($key === false || $key === true)
 		{
-			$key = ($key === false) ? 0 : sizeof($block);
+			$key = ($key === false) ? 0 : count($block);
 		}
 
 		// Get correct position if array given
@@ -526,9 +504,9 @@ class context
 		if ($mode == 'insert')
 		{
 			// Make sure we are not exceeding the last iteration
-			if ($key >= sizeof($block))
+			if ($key >= count($block))
 			{
-				$key = sizeof($block);
+				$key = count($block);
 				unset($block[($key - 1)]['S_LAST_ROW']);
 				$vararray['S_LAST_ROW'] = true;
 			}
@@ -543,7 +521,7 @@ class context
 			$vararray['S_BLOCK_NAME'] = $name;
 
 			// Re-position template blocks
-			for ($i = sizeof($block); $i > $key; $i--)
+			for ($i = count($block); $i > $key; $i--)
 			{
 				$block[$i] = $block[$i-1];
 
@@ -561,12 +539,12 @@ class context
 		if ($mode == 'change')
 		{
 			// If key is out of bounds, do not change anything
-			if ($key > sizeof($block) || $key < 0)
+			if ($key > count($block) || $key < 0)
 			{
 				return false;
 			}
 
-			if ($key == sizeof($block))
+			if ($key == count($block))
 			{
 				$key--;
 			}
@@ -580,26 +558,26 @@ class context
 		if ($mode == 'delete')
 		{
 			// If we are exceeding last iteration, do not delete anything
-			if ($key > sizeof($block) || $key < 0)
+			if ($key > count($block) || $key < 0)
 			{
 				return false;
 			}
 
 			// If we are positioned at the end, we remove the last element
-			if ($key == sizeof($block))
+			if ($key == count($block))
 			{
 				$key--;
 			}
 
 			// We are deleting the last element in the block, so remove the block
-			if (sizeof($block) === 1)
+			if (count($block) === 1)
 			{
 				$block = null; // unset($block); does not work on references
 				return true;
 			}
 
 			// Re-position template blocks
-			for ($i = $key; $i < sizeof($block)-1; $i++)
+			for ($i = $key; $i < count($block)-1; $i++)
 			{
 				$block[$i] = $block[$i+1];
 				$block[$i]['S_ROW_COUNT'] = $block[$i]['S_ROW_NUM'] = $i;
@@ -610,7 +588,7 @@ class context
 
 			// Set first and last elements again, in case they were removed
 			$block[0]['S_FIRST_ROW'] = true;
-			$block[sizeof($block)-1]['S_LAST_ROW'] = true;
+			$block[count($block)-1]['S_LAST_ROW'] = true;
 
 			return true;
 		}
@@ -631,13 +609,13 @@ class context
 		{
 			// Nested block.
 			$blocks = explode('.', $blockname);
-			$blockcount = sizeof($blocks) - 1;
+			$blockcount = count($blocks) - 1;
 
 			$str = &$this->tpldata;
 			for ($i = 0; $i < $blockcount; $i++)
 			{
 				$str = &$str[$blocks[$i]];
-				$str = &$str[sizeof($str) - 1];
+				$str = &$str[count($str) - 1];
 			}
 
 			unset($str[$blocks[$blockcount]]);
author	stevendegroote <stevendegroote@gmail.com>	2019-09-17 23:15:54 +0200
committer	stevendegroote <stevendegroote@gmail.com>	2019-09-17 23:15:54 +0200
commit	f8967fec78d826ea8d9ca34f65966ff8a7674b47 (patch)
tree	f9c5f408e7764ec6343e084e7fc6d62d07e3400f /phpBB/phpbb/template/context.php
parent	ce93b224107a65b43253c36812b636321eb55a78 (diff)
parent	4db585a4cb2e5359074a82ef088574609155294b (diff)
download	forums-f8967fec78d826ea8d9ca34f65966ff8a7674b47.tar forums-f8967fec78d826ea8d9ca34f65966ff8a7674b47.tar.gz forums-f8967fec78d826ea8d9ca34f65966ff8a7674b47.tar.bz2 forums-f8967fec78d826ea8d9ca34f65966ff8a7674b47.tar.xz forums-f8967fec78d826ea8d9ca34f65966ff8a7674b47.zip