From 1bed9da9ab99991e834423e198b3bc35a654b220 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Tue, 8 Nov 2016 19:01:26 -0800
Subject: [PATCH] Option added to set unique IDs for each tablerender()
 instance.

---
 class2.php                                    | 26 +++++++++++++++----
 .../shortcodes/batch/admin_shortcodes.php     |  5 ++--
 e107_handlers/menu_class.php                  |  2 ++
 e107_themes/bootstrap3/admin_theme.php        |  3 +++
 4 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/class2.php b/class2.php
index 12a111c1f..a0dabcde8 100644
--- a/class2.php
+++ b/class2.php
@@ -908,7 +908,8 @@ if (!class_exists('e107table', false))
 		private $themeClass = '';
 		private $adminThemeClass = '';
 		public  $frontend = null;
-		
+		private $uniqueId = null;
+
 		
 		function __construct()
 		{
@@ -918,13 +919,23 @@ if (!class_exists('e107table', false))
 
 
 		/**
-		 * @param $style
+		 * Set the style mode for use in tablestyle() method/function
+		 * @param string $style
 		 */
-		function setStyle($style)
+		public function setStyle($style)
 		{
 			$this->eSetStyle = $style;
 		}
 
+		/**
+		 * Set a unique id for use in tablestyle() method/function
+		 * @param string $id
+		 */
+		public function setUniqueId($id)
+		{
+			$this->uniqueId = $id;
+		}
+
 
 		/**
 		 * @param $caption string caption text
@@ -948,6 +959,10 @@ if (!class_exists('e107table', false))
 				extract($result);
 			}
 
+
+
+
+
 			if ($return)
 			{
             	if(!empty($text) && $this->eMenuArea)
@@ -998,13 +1013,14 @@ if (!class_exists('e107table', false))
 			
 			if(is_object(vartrue($thm)))
 			{
-				$thm->tablestyle($caption, $text, $mode, array('menuArea'=>$this->eMenuArea, 'menuCount'=>$this->eMenuCount,	'menuTotal'=>varset($this->eMenuTotal[$this->eMenuArea]), 'setStyle'=>$this->eSetStyle));
+				$thm->tablestyle($caption, $text, $mode, array('uniqueId'=>$this->uniqueId, 'menuArea'=>$this->eMenuArea, 'menuCount'=>$this->eMenuCount,	'menuTotal'=>varset($this->eMenuTotal[$this->eMenuArea]), 'setStyle'=>$this->eSetStyle));
 			}
 			else 
 			{
-				tablestyle($caption, $text, $mode, array('menuArea'=>$this->eMenuArea,'menuCount'=>$this->eMenuCount,'menuTotal'=>varset($this->eMenuTotal[$this->eMenuArea]),'setStyle'=>$this->eSetStyle));	
+				tablestyle($caption, $text, $mode, array('uniqueId'=>$this->uniqueId, 'menuArea'=>$this->eMenuArea,'menuCount'=>$this->eMenuCount,'menuTotal'=>varset($this->eMenuTotal[$this->eMenuArea]),'setStyle'=>$this->eSetStyle));
 			}
 
+			$this->uniqueId = null;
 		}
 
 
diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php
index 43be7fc1d..17486a70b 100644
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -507,7 +507,7 @@ class admin_shortcodes
 
 				
 				//	$text .= "</div>";
-					
+					$ns->setUniqueId('e-latest-list');
 					return ($parm != 'norender') ? $ns -> tablerender(ADLAN_LAT_1, $text, '', TRUE) : $text;	
 
 				}
@@ -983,6 +983,7 @@ class admin_shortcodes
 			if ($pref['adminpwordchange'] && ((ADMINPWCHANGE+2592000) < time()))
 			{
 				$text = "<div style='mediumtext; text-align:center'>".ADLAN_102." <a href='".e_ADMIN."updateadmin.php'>".ADLAN_103.'</a></div>';
+				$ns->setUniqueId('e-password-change');
 				return $ns -> tablerender(ADLAN_104, $text, '', true);
 			}
 		}
@@ -1208,7 +1209,7 @@ class admin_shortcodes
 					
 				//	$text .= "\n\t\t\t\t\t</div>";
 					
-					
+					$ns->setUniqueId('e-status-list');
 					return ($parm != 'norender') ? $ns -> tablerender(LAN_STATUS, $text, '', TRUE) : $text;
 				}
 			}
diff --git a/e107_handlers/menu_class.php b/e107_handlers/menu_class.php
index 15c410dcd..59405a8a5 100644
--- a/e107_handlers/menu_class.php
+++ b/e107_handlers/menu_class.php
@@ -513,6 +513,7 @@ class e_menu
 				
 			//	if($template['noTableRender'] !==true) // XXX Deprecated - causes confusion while themeing. use {SETSTYLE=none} instead. 
 			//	{
+					$ns->setUniqueId('cmenu-'.$page['menu_name']);
 					$ns->tablerender($caption, $text, 'cmenu-'.$page['menu_template']);
 			//	}
 			//	else
@@ -524,6 +525,7 @@ class e_menu
 			else 
 			{				
 				$text = $tp->toHTML($page['menu_text'], true, 'parse_sc, constants');
+				$ns->setUniqueId('cmenu-'.$page['menu_name']);
 				$ns->tablerender($caption, $text, 'cmenu');
 			}
 			
diff --git a/e107_themes/bootstrap3/admin_theme.php b/e107_themes/bootstrap3/admin_theme.php
index 24b253d1a..89ed4f7b1 100644
--- a/e107_themes/bootstrap3/admin_theme.php
+++ b/e107_themes/bootstrap3/admin_theme.php
@@ -102,6 +102,9 @@ class bootstrap3_admintheme
 		$style = $data['setStyle'];
 
 	//	echo "Style: ".$style;
+
+		echo "\n\n<!-- UniqueID: ".$data['uniqueId']." -->\n\n";
+
 		$class = '';
 
 		if(is_string($mode) && $mode == 'admin_help') $class = ' '.str_replace('_', '-', $mode);