From 08ad107a8ba46582cab3f546817a5f1327633b94 Mon Sep 17 00:00:00 2001
From: chriskl <chriskl>
Date: Mon, 19 May 2003 15:06:52 +0000
Subject: [PATCH] printVal run

---
 browser.php | 14 +++++++-------
 schema.php  |  5 +++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/browser.php b/browser.php
index b0256169..3c4112f3 100644
--- a/browser.php
+++ b/browser.php
@@ -5,7 +5,7 @@
 	 * if you click on a database it shows a list of database objects in that
 	 * database.
 	 *
-	 * $Id: browser.php,v 1.8 2003/05/12 09:55:14 chriskl Exp $
+	 * $Id: browser.php,v 1.9 2003/05/19 15:06:52 chriskl Exp $
 	 */
 
 	// Include application functions
@@ -21,7 +21,7 @@
 	// Construct expanding tree
 	$menu  = new HTML_TreeMenu();
 	$root = new HTML_TreeNode(array(
-						'text' => addslashes(htmlspecialchars(($conf['servers'][$_SESSION['webdbServerID']]['desc']))), 
+						'text' => addslashes($misc->printVal(($conf['servers'][$_SESSION['webdbServerID']]['desc']))), 
 						'link' => 'all_db.php', 
 						'icon' => 'folder.gif', 
 						'expandedIcon' => 'folder-expanded.gif',
@@ -36,7 +36,7 @@
 	 * @param $schemanode Node onto which to add
 	 */	
 	function addNodes(&$schemanode, $querystr) {
-		global $data, $localData, $lang, $conf;
+		global $data, $localData, $misc, $lang, $conf;
 		
 		// Tables
 		if ($data->hasTables()) {
@@ -54,7 +54,7 @@
 			$tables = &$localData->getTables();
 			while (!$tables->EOF) {
 				$item_node = &new HTML_TreeNode(array(
-								'text' => addslashes(htmlspecialchars($tables->f[$data->tbFields['tbname']])), 
+								'text' => addslashes($misc->printVal($tables->f[$data->tbFields['tbname']])), 
 								'link' => addslashes(htmlspecialchars("tblproperties.php?{$querystr}&table=" .
 									urlencode($tables->f[$data->tbFields['tbname']]))), 
 								'icon' => "../../../images/themes/{$conf['theme']}/tables.gif", 
@@ -127,7 +127,7 @@
 		// If database is selected, show folder, otherwise show document
 		if (isset($_REQUEST['database']) && $_REQUEST['database'] == $databases->f[$data->dbFields['dbname']]) {
 			$db_node = &new HTML_TreeNode(array(
-								'text' => addslashes(htmlspecialchars($databases->f[$data->dbFields['dbname']])), 
+								'text' => addslashes($misc->printVal($databases->f[$data->dbFields['dbname']])), 
 								'link' => addslashes(htmlspecialchars('database.php?database=' . urlencode($databases->f[$data->dbFields['dbname']]))), 
 								'icon' => "../../../images/themes/{$conf['theme']}/database.gif", 
 								'expandedIcon' => "../../../images/themes/{$conf['theme']}/database.gif",
@@ -143,7 +143,7 @@
 					$querystr = 'database=' . urlencode($databases->f[$data->dbFields['dbname']]). '&schema=' .
 							urlencode($schemas->f[$data->nspFields['nspname']]);
 					$schemanode = &new HTML_TreeNode(array(
-									'text' => addslashes(htmlspecialchars($schemas->f[$data->nspFields['nspname']])), 
+									'text' => addslashes($misc->printVal($schemas->f[$data->nspFields['nspname']])), 
 									'link' => addslashes(htmlspecialchars("schema.php?{$querystr}")), 
 									'icon' => 'folder.gif', 
 									'expandedIcon' => 'folder-expanded.gif',
@@ -174,7 +174,7 @@
 
 		} else {
 			$db_node = &new HTML_TreeNode(array(
-								'text' => addslashes(htmlspecialchars($databases->f[$data->dbFields['dbname']])), 
+								'text' => addslashes($misc->printVal($databases->f[$data->dbFields['dbname']])), 
 								'link' => addslashes(htmlspecialchars("{$_SERVER['PHP_SELF']}?database=" . urlencode($databases->f[$data->dbFields['dbname']]))), 
 								'icon' => "../../../images/themes/{$conf['theme']}/database.gif", 
 								'expandedIcon' => "../../../images/themes/{$conf['theme']}/database.gif",
diff --git a/schema.php b/schema.php
index 893cd66a..a1407098 100755
--- a/schema.php
+++ b/schema.php
@@ -3,7 +3,7 @@
 	/**
 	 * Display properties of a schema
 	 *
-	 * $Id: schema.php,v 1.4 2003/03/25 06:50:37 chriskl Exp $
+	 * $Id: schema.php,v 1.5 2003/05/19 15:06:52 chriskl Exp $
 	 */
 
 	// Include application functions
@@ -19,7 +19,8 @@
 	function doDefault($msg = '') {
 		global $misc, $lang;
 		
-		echo "<h2>", htmlspecialchars($_REQUEST['database']), ": {$lang['strschemas']}: ", htmlspecialchars($_REQUEST['schema']), "</h2>\n";
+		echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strschemas']}: ", 
+			$misc->printVal($_REQUEST['schema']), "</h2>\n";
 		
 		echo "<ul>\n";
 		echo "<li><a href=\"tables.php?{$misc->href}\">{$lang['strtables']}</a></li>\n";
-- 
2.39.5