From 63527c4f1953fe2bec5f8da6037609c73dfc74ed Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Mon, 21 Dec 2020 06:43:07 -0800
Subject: [PATCH] Code cleanup. Extra debug info under Paths.

---
 e107_admin/mailout.php           |  4 +--
 e107_handlers/db_debug_class.php | 43 ++++++++++++++++++++++++++++++--
 e107_plugins/user/e_mailout.php  |  2 +-
 3 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php
index 9c4be1789..f6a6ffe54 100644
--- a/e107_admin/mailout.php
+++ b/e107_admin/mailout.php
@@ -649,11 +649,11 @@ class mailout_main_ui extends e_admin_ui
 	}
 	
 	
-	function afterCopy($result, $copied)
+	function afterCopy($result, $selected)
 	{
 		$num = array();
 		$count = 0; 
-		foreach($copied as $tmp)
+		foreach($selected as $tmp)
 		{
 			$num[] = ($result + $count);
 			$count ++; 	
diff --git a/e107_handlers/db_debug_class.php b/e107_handlers/db_debug_class.php
index d196ab060..506b05b40 100644
--- a/e107_handlers/db_debug_class.php
+++ b/e107_handlers/db_debug_class.php
@@ -799,7 +799,8 @@
 				return false;
 			}
 
-			global $e107;
+
+			$e107 = e107::getInstance();
 			$sql = e107::getDb();
 
 			$text = "<table class='table table-striped table-condensed debug-footer' style='width:100%'>
@@ -845,16 +846,48 @@
 				<td>SQL Language</td>
 				<td>" . $sql->mySQLlanguage . "</td>
 			</tr>
+			
+			
 ";
 			if($_SERVER['E_DEV'] == 'true')
 			{
 				$text .= "
 				<tr>
-					<td  colspan='2'><pre>" . htmlspecialchars(print_r($e107, true)) . "</pre></td>
+					<th colspan='2'><h2>e107 Object</h2></td>
 				</tr>";
+
+					foreach($e107 as $key=>$val)
+					{
+						$text .= "
+						<tr>
+							<td>".$key."</td>
+							<td><pre>" . htmlspecialchars(print_r($val, true)) . "</pre></td>
+						</tr>";
+					}
 			}
 
 			$text .= "
+			<tr>
+				<th colspan='2'><h2>Registry</h2></td>
+			</tr>";
+
+			$regis = e107::getRegistry('_all_');
+			ksort($regis);
+			$c = 0;
+			foreach($regis as $key=>$val)
+			{
+				$id = "view-registry-".$c;
+
+				$text .= "<tr>
+				<td>".$key."</td>
+				<td><a href='#".$id."' class='btn btn-sm btn-default e-expandit'>View</a><div id='".$id."' class='e-hideme'>" . print_a($val,true). "</div></td>
+				</tr>";
+				$c++;
+
+			}
+
+			$text .= "
+			
 			<tr>
 				<th colspan='2'><h2>Session</h2></td>
 			</tr>
@@ -871,6 +904,12 @@
 				<td>" . $sess->getSaveMethod() . "</td>
 			</tr>
 			
+			<tr>
+				<td>Registry</td>
+				<td>" . $sess->getSaveMethod() . "</td>
+			</tr>
+			
+			
 			
 			
 			<tr>
diff --git a/e107_plugins/user/e_mailout.php b/e107_plugins/user/e_mailout.php
index 77aed5d01..8c2a06fa6 100644
--- a/e107_plugins/user/e_mailout.php
+++ b/e107_plugins/user/e_mailout.php
@@ -283,7 +283,7 @@ class user_mailout
 	 * @param $allow_edit is TRUE to allow user to change the selection; FALSE to just display current settings
 	 * @param $selectVals is the current selection information - in the same format as returned by returnSelectors()
 	 *
-	 * @return Returns HTML which is displayed in a table cell. Typically we return a complete table
+	 * @return array Returns HTML which is displayed in a table cell. Typically we return a complete table
 	 */
 	public function showSelect($allow_edit = FALSE, $selectVals = FALSE)
 	{