From cff57f9076dd160b2185895f7298d4acbc5b5bb3 Mon Sep 17 00:00:00 2001
From: javiexin <javiexin@gmail.com>
Date: Wed, 28 Dec 2016 12:55:26 +0100
Subject: [ticket/14944] Add possibility to search for template loop indexes by
 key

Adds a new function to the template interface, and implements it in the
context class.  The function returns the ordinal index for a specified key,
with the same structure that the key for alter_block_array.
Reuses same code.

PHPBB3-14944
---
 phpBB/phpbb/template/base.php     |  8 +++++
 phpBB/phpbb/template/context.php  | 71 +++++++++++++++++++++++++++++++++++++++
 phpBB/phpbb/template/template.php | 17 ++++++++++
 3 files changed, 96 insertions(+)

(limited to 'phpBB/phpbb')

diff --git a/phpBB/phpbb/template/base.php b/phpBB/phpbb/template/base.php
index 9a40702ba8..bc0f022cc4 100644
--- a/phpBB/phpbb/template/base.php
+++ b/phpBB/phpbb/template/base.php
@@ -132,6 +132,14 @@ abstract class base implements template
 		return $this->context->alter_block_array($blockname, $vararray, $key, $mode);
 	}
 
+	/**
+	* {@inheritdoc}
+	*/
+	public function find_key_index($blockname, $key = false)
+	{
+		return $this->context->find_key_index($blockname, $key);
+	}
+
 	/**
 	* Calls hook if any is defined.
 	*
diff --git a/phpBB/phpbb/template/context.php b/phpBB/phpbb/template/context.php
index 4ee48205c8..e390c5a677 100644
--- a/phpBB/phpbb/template/context.php
+++ b/phpBB/phpbb/template/context.php
@@ -263,6 +263,77 @@ class context
 		return true;
 	}
 
+	/**
+	* Find the index for a specified key in the innermost specified block
+	*
+	* @param	string	$blockname	the blockname, for example 'loop'
+	* @param	mixed	$key		Key to search for
+	*
+	* array: KEY => VALUE [the key/value pair to search for within the loop to determine the correct position]
+	*
+	* int: Position [the position to search for]
+	*
+	* If key is false the position is set to 0
+	* If key is true the position is set to the last entry
+	*
+	* @return mixed false if not found, index position otherwise; be sure to test with ===
+	*/
+	public function find_key_index($blockname, $key = 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++)
+		{
+			if (($pos = strpos($blocks[$i], '[')) !== false)
+			{
+				$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);
+				}
+			}
+			else
+			{
+				$name = $blocks[$i];
+				$index = sizeof($block[$name]) - 1;
+			}
+			$block = &$block[$name];
+			$block = &$block[$index];
+		}
+
+		$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)
+		{
+			return ($key === false) ? 0 : sizeof($block);
+		}
+
+		// Get correct position if array given
+		if (is_array($key))
+		{
+			// Search array to get correct position
+			list($search_key, $search_value) = @each($key);
+			foreach ($block as $i => $val_ary)
+			{
+				if ($val_ary[$search_key] === $search_value)
+				{
+					return $i;
+				}
+			}
+		}
+
+		return false;
+	}
+
 	/**
 	* Change already assigned key variable pair (one-dimensional - single loop entry)
 	*
diff --git a/phpBB/phpbb/template/template.php b/phpBB/phpbb/template/template.php
index 041ecb12e4..b5a6ab32dc 100644
--- a/phpBB/phpbb/template/template.php
+++ b/phpBB/phpbb/template/template.php
@@ -172,6 +172,23 @@ interface template
 	*/
 	public function alter_block_array($blockname, array $vararray, $key = false, $mode = 'insert');
 
+	/**
+	* Find the index for a specified key in the innermost specified block
+	*
+	* @param	string	$blockname	the blockname, for example 'loop'
+	* @param	mixed	$key		Key to search for
+	*
+	* array: KEY => VALUE [the key/value pair to search for within the loop to determine the correct position]
+	*
+	* int: Position [the position to search for]
+	*
+	* If key is false the position is set to 0
+	* If key is true the position is set to the last entry
+	*
+	* @return mixed false if not found, index position otherwise; be sure to test with ===
+	*/
+	public function find_key_index($blockname, $key = false);
+
 	/**
 	* Get path to template for handle (required for BBCode parser)
 	*
-- 
cgit v1.2.1


From c656bd60ef99218a710882b6f640fea099e9c6e2 Mon Sep 17 00:00:00 2001
From: javiexin <javiexin@gmail.com>
Date: Fri, 30 Dec 2016 18:03:09 +0100
Subject: [ticket/14944] Add possibility to search for template loop indexes by
 key

Adds a new function to the template interface, and implements it in the
context class.  The function returns the ordinal index for a specified key,
with the same structure that the key for alter_block_array.
Reuses same code. Remove unneeded references, do nothing for int keys.

PHPBB3-14944
---
 phpBB/phpbb/template/context.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/phpbb')

diff --git a/phpBB/phpbb/template/context.php b/phpBB/phpbb/template/context.php
index e390c5a677..1617ca3d19 100644
--- a/phpBB/phpbb/template/context.php
+++ b/phpBB/phpbb/template/context.php
@@ -284,7 +284,7 @@ class context
 		$blocks = explode('.', $blockname);
 		$blockcount = sizeof($blocks) - 1;
 
-		$block = &$this->tpldata;
+		$block = $this->tpldata;
 		for ($i = 0; $i < $blockcount; $i++)
 		{
 			if (($pos = strpos($blocks[$i], '[')) !== false)
@@ -305,11 +305,11 @@ class context
 				$name = $blocks[$i];
 				$index = sizeof($block[$name]) - 1;
 			}
-			$block = &$block[$name];
-			$block = &$block[$index];
+			$block = $block[$name];
+			$block = $block[$index];
 		}
 
-		$block = &$block[$blocks[$i]]; // Traverse the last block
+		$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)
@@ -331,7 +331,7 @@ class context
 			}
 		}
 
-		return false;
+		return is_int($key) ? $key : false;
 	}
 
 	/**
-- 
cgit v1.2.1


From 20c03cccdde2302412d1e14adda370e7eb57b8e8 Mon Sep 17 00:00:00 2001
From: javiexin <javiexin@gmail.com>
Date: Sun, 8 Jan 2017 00:00:47 +0100
Subject: [ticket/14944] Add possibility to search for template loop indexes by
 key

Adds a new function to the template interface, and implements it in the
context class.  The function returns the ordinal index for a specified key,
with the same structure that the key for alter_block_array.
Reuses same code. Remove unneeded references, do nothing for int keys.
Check out of bounds or wrong blockname errors.  Added tests.

PHPBB3-14944
---
 phpBB/phpbb/template/context.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'phpBB/phpbb')

diff --git a/phpBB/phpbb/template/context.php b/phpBB/phpbb/template/context.php
index 1617ca3d19..8bfbd73f1a 100644
--- a/phpBB/phpbb/template/context.php
+++ b/phpBB/phpbb/template/context.php
@@ -305,16 +305,28 @@ class context
 				$name = $blocks[$i];
 				$index = sizeof($block[$name]) - 1;
 			}
+			if (!isset($block[$name]))
+			{
+				return false;
+			}
 			$block = $block[$name];
+			if (!isset($block[$index]))
+			{
+				return false;
+			}
 			$block = $block[$index];
 		}
 
+		if (!isset($block[$blocks[$i]]))
+		{
+			return false;
+		}
 		$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)
 		{
-			return ($key === false) ? 0 : sizeof($block);
+			return ($key === false) ? 0 : sizeof($block) - 1;
 		}
 
 		// Get correct position if array given
@@ -331,7 +343,7 @@ class context
 			}
 		}
 
-		return is_int($key) ? $key : false;
+		return (is_int($key) && ((0 <= $key) && ($key < sizeof($block)))) ? $key : false;
 	}
 
 	/**
-- 
cgit v1.2.1


From 849fd9df7d9b2e449801e14ef54584fc8e063d43 Mon Sep 17 00:00:00 2001
From: javiexin <javiexin@gmail.com>
Date: Sat, 28 Jan 2017 21:34:08 +0100
Subject: [ticket/14944] Add possibility to search for template loop indexes by
 key

Adds a new function to the template interface, and implements it in the
context class.  The function returns the ordinal index for a specified key,
with the same structure that the key for alter_block_array.
Reuses same code. Remove unneeded references, do nothing for int keys.
Check out of bounds or wrong blockname errors.  Added tests.
Remove default parameter value.

PHPBB3-14944
---
 phpBB/phpbb/template/base.php     | 2 +-
 phpBB/phpbb/template/context.php  | 2 +-
 phpBB/phpbb/template/template.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/phpbb')

diff --git a/phpBB/phpbb/template/base.php b/phpBB/phpbb/template/base.php
index bc0f022cc4..41c0a01ba8 100644
--- a/phpBB/phpbb/template/base.php
+++ b/phpBB/phpbb/template/base.php
@@ -135,7 +135,7 @@ abstract class base implements template
 	/**
 	* {@inheritdoc}
 	*/
-	public function find_key_index($blockname, $key = false)
+	public function find_key_index($blockname, $key)
 	{
 		return $this->context->find_key_index($blockname, $key);
 	}
diff --git a/phpBB/phpbb/template/context.php b/phpBB/phpbb/template/context.php
index 8bfbd73f1a..e70d0574be 100644
--- a/phpBB/phpbb/template/context.php
+++ b/phpBB/phpbb/template/context.php
@@ -278,7 +278,7 @@ class context
 	*
 	* @return mixed false if not found, index position otherwise; be sure to test with ===
 	*/
-	public function find_key_index($blockname, $key = false)
+	public function find_key_index($blockname, $key)
 	{
 		// For nested block, $blockcount > 0, for top-level block, $blockcount == 0
 		$blocks = explode('.', $blockname);
diff --git a/phpBB/phpbb/template/template.php b/phpBB/phpbb/template/template.php
index b5a6ab32dc..9e3d658ca8 100644
--- a/phpBB/phpbb/template/template.php
+++ b/phpBB/phpbb/template/template.php
@@ -187,7 +187,7 @@ interface template
 	*
 	* @return mixed false if not found, index position otherwise; be sure to test with ===
 	*/
-	public function find_key_index($blockname, $key = false);
+	public function find_key_index($blockname, $key);
 
 	/**
 	* Get path to template for handle (required for BBCode parser)
-- 
cgit v1.2.1