change htmlspecialchars to urlencode in URLs for language purposes

diff --git a/all_db.php b/all_db.php
index fa3445118770de677244e6f4f4c92b0d4d7fb65a..942da28dbd58c83dff10de7506e4a161f1de2eb5 100644 (file)
--- a/all_db.php
+++ b/all_db.php
@@ -3,7 +3,7 @@
        /**
         * Manage databases within a server
         *
-        * $Id: all_db.php,v 1.9 2003/03/17 05:20:29 chriskl Exp $
+        * $Id: all_db.php,v 1.10 2003/03/23 03:13:57 chriskl Exp $
         */
 
        // Include application functions
@@ -55,7 +55,7 @@
                echo "<form action=\"$PHP_SELF\" method=post>\n";
                echo "<table width=100%>\n";
                echo "<tr><th class=data>{$lang['strname']}</th><th class=data>{$lang['strencoding']}</th></tr>\n";
-               echo "<tr><td class=data1><input name=formName size={$data->_maxNameLen} maxlength={$data->_maxNameLen} value=\"", 
+               echo "<tr><td class=data1><input name=formName size={$data->_maxNameLen} maxlength={$data->_maxNameLen} value=\"",
                        htmlspecialchars($_POST['formName']), "\"></td>";
                echo "<td class=data1>";
                echo "<select name=formEncoding>";
@@ -112,7 +112,7 @@
                                echo "<td class=data{$id}>", htmlspecialchars($databases->f[$data->dbFields['encoding']]), "</td>\n";
                                echo "<td class=data{$id}>", htmlspecialchars($databases->f[$data->dbFields['dbcomment']]), "</td>\n";
                                echo "<td class=opbutton{$id}><a href=\"$PHP_SELF?action=confirm_drop&database=",
-                                       htmlspecialchars($databases->f[$data->dbFields['dbname']]), "\">{$lang['strdrop']}</a></td>\n";
+                                       urlencode($databases->f[$data->dbFields['dbname']]), "\">{$lang['strdrop']}</a></td>\n";
                                echo "</tr>\n";
                                $databases->moveNext();
                                $i++;

diff --git a/constraints.php b/constraints.php
index 920a092b2ee869cc676302f57aa4062e192b4c16..75fcc0a5aec638de73439ea05c750d216099a37a 100644 (file)
--- a/constraints.php
+++ b/constraints.php
@@ -3,7 +3,7 @@
        /**
         * List constraints on a table
         *
-        * $Id: constraints.php,v 1.7 2003/03/18 09:15:49 chriskl Exp $
+        * $Id: constraints.php,v 1.8 2003/03/23 03:13:57 chriskl Exp $
         */
 
        // Include application functions
@@ -125,8 +125,8 @@
                                }
                                echo "</td>";
                                echo "<td class=\"data{$id}\">";
-                               echo "<a href=\"$PHP_SELF?action=confirm_drop&{$misc->href}&constraint=", htmlspecialchars($constraints->f[$data->cnFields['conname']]),
-                                       "&table=", htmlspecialchars($_REQUEST['table']), "\">{$lang['strdrop']}</td></tr>\n";
+                               echo "<a href=\"$PHP_SELF?action=confirm_drop&{$misc->href}&constraint=", urlencode($constraints->f[$data->cnFields['conname']]),
+                                       "&table=", urlencode($_REQUEST['table']), "\">{$lang['strdrop']}</td></tr>\n";
 
                                $constraints->moveNext();
                                $i++;
@@ -137,7 +137,7 @@
                else
                        echo "<p>{$lang['strnoconstraints']}</p>\n";
                
-               echo "<p><a href=\"{$PHP_SELF}?action=add_check&{$misc->href}&table=", htmlspecialchars($_REQUEST['table']),
+               echo "<p><a href=\"{$PHP_SELF}?action=add_check&{$misc->href}&table=", urlencode($_REQUEST['table']),
                        "\">{$lang['straddcheck']}</a></p>\n";
        }
 

diff --git a/database.php b/database.php
index 0a7c3a3555dd5dc219975fb1877ad1c5d1b4e319..909a127a7b60c1b2513168535ec64c7c1a85a75b 100755 (executable)
--- a/database.php
+++ b/database.php
@@ -3,7 +3,7 @@
        /**
         * Manage schemas within a database
         *
-        * $Id: database.php,v 1.9 2003/03/18 09:14:25 chriskl Exp $
+        * $Id: database.php,v 1.10 2003/03/23 03:13:57 chriskl Exp $
         */
 
        // Include application functions
@@ -183,11 +183,11 @@
                                        echo "<tr><td class=data{$id}>", htmlspecialchars($schemas->f[$data->nspFields['nspname']]), "</td>\n";
                                        echo "<td class=data{$id}>", htmlspecialchars($schemas->f[$data->nspFields['nspowner']]), "</td>\n";
                                        echo "<td class=opbutton{$id}><a href=\"$PHP_SELF?action=confirm_drop&database=",
-                                               htmlspecialchars($_REQUEST['database']), "&schema=",
-                                               htmlspecialchars($schemas->f[$data->nspFields['nspname']]), "\">{$lang['strdrop']}</a></td>\n";
+                                               urlencode($_REQUEST['database']), "&schema=",
+                                               urlencode($schemas->f[$data->nspFields['nspname']]), "\">{$lang['strdrop']}</a></td>\n";
                                        echo "<td class=opbutton{$id}><a href=\"privileges.php?database=",
-                                               htmlspecialchars($_REQUEST['database']), "&object=",
-                                               htmlspecialchars($schemas->f[$data->nspFields['nspname']]), "&type=schema\">{$lang['strprivileges']}</a></td>\n";
+                                               urlencode($_REQUEST['database']), "&object=",
+                                               urlencode($schemas->f[$data->nspFields['nspname']]), "&type=schema\">{$lang['strprivileges']}</a></td>\n";
                                        echo "</tr>\n";
                                        $schemas->moveNext();
                                        $i++;

diff --git a/display.php b/display.php
index ac64d041d6e38c32ffaabad27a041f4370690228..2fbca5b64e3e0c78a480ca7bc3bf09801c9cd9fc 100644 (file)
--- a/display.php
+++ b/display.php
@@ -9,7 +9,7 @@
         * @param $return_desc The return link name
         * @param $page The current page
         *
-        * $Id: display.php,v 1.8 2003/03/17 05:20:29 chriskl Exp $
+        * $Id: display.php,v 1.9 2003/03/23 03:13:57 chriskl Exp $
         */
 
        // Include application functions
@@ -70,7 +70,7 @@
        }
        else echo "<p>No data.</p>\n";
        
-       echo "<p><a class=\"navlink\" href=\"{$_REQUEST['return_url']}\">", htmlspecialchars($_REQUEST['return_desc']), "</a></p>\n";
+       echo "<p><a class=\"navlink\" href=\"{$_REQUEST['return_url']}\">", urlencode($_REQUEST['return_desc']), "</a></p>\n";
 
        $misc->printFooter();
 ?>

diff --git a/indexes.php b/indexes.php
index 5ab5203a0f7f4add78ab9038dd1f9f460538d47e..964bbd97823512d912cfa80af429fad98fe242ed 100644 (file)
--- a/indexes.php
+++ b/indexes.php
@@ -3,7 +3,7 @@
        /**
         * List indexes on a table
         *
-        * $Id: indexes.php,v 1.7 2003/03/17 05:20:30 chriskl Exp $
+        * $Id: indexes.php,v 1.8 2003/03/23 03:13:57 chriskl Exp $
         */
 
        // Include application functions
@@ -116,8 +116,8 @@
                global $PHP_SELF, $lang;
 
                if ($confirm) {
-                       echo "<h2>", htmlspecialchars($_REQUEST['database']), ": Tables: ",
-                               htmlspecialchars($_REQUEST['table']), ": " , htmlspecialchars($_REQUEST['index']), ": Drop</h2>\n";
+                       echo "<h2>", htmlspecialchars($_REQUEST['database']), ": {$lang['strtables']}: ",
+                               htmlspecialchars($_REQUEST['table']), ": " , htmlspecialchars($_REQUEST['index']), ": {$lang['strdrop']}</h2>\n";
 
                        echo "<p>", sprintf($lang['strconfdropindex'], htmlspecialchars($_REQUEST['index'])), "</p>\n";
 
@@ -159,8 +159,8 @@
                                echo "<tr><td class=\"data{$id}\">", htmlspecialchars( $indexes->f[$data->ixFields['idxname']]), "</td>";
                                echo "<td class=\"data{$id}\">", htmlspecialchars( $indexes->f[$data->ixFields['idxdef']]), "</td>";
                                echo "<td class=\"data{$id}\">";
-                               echo "<a href=\"$PHP_SELF?action=confirm_drop_index&{$misc->href}&index=", htmlspecialchars( $indexes->f[$data->ixFields['idxname']]), 
-                                       "&table=", htmlspecialchars($_REQUEST['table']), "\">{$lang['strdrop']}</td></tr>\n";
+                               echo "<a href=\"$PHP_SELF?action=confirm_drop_index&{$misc->href}&index=", urlencode( $indexes->f[$data->ixFields['idxname']]), 
+                                       "&table=", urlencode($_REQUEST['table']), "\">{$lang['strdrop']}</td></tr>\n";
 
                                $indexes->movenext();
                                $i++;
@@ -171,7 +171,7 @@
                else
                        echo "<p>{$lang['strnoindexes']}</p>\n";
                
-               echo "<p><a class=\"navlink\" href=\"$PHP_SELF?action=create_index&{$misc->href}&table=", htmlspecialchars($_REQUEST['table']), "\">{$lang['strcreateindex']}</a></p>\n";               
+               echo "<p><a class=\"navlink\" href=\"$PHP_SELF?action=create_index&{$misc->href}&table=", urlencode($_REQUEST['table']), "\">{$lang['strcreateindex']}</a></p>\n";              
        }
 
        $misc->printHeader($lang['strindexes'], "<script src=\"indexes.js\" type=\"text/javascript\"></script>");

diff --git a/privileges.php b/privileges.php
index c355d16077664a43c2e565f2775f741fc498d8cb..5c68cbe0c4cb22adc1fb6cbe2ad449b053dfb81d 100644 (file)
--- a/privileges.php
+++ b/privileges.php
@@ -3,7 +3,7 @@
        /**
         * Manage privileges in a database
         *
-        * $Id: privileges.php,v 1.8 2003/03/17 05:20:30 chriskl Exp $
+        * $Id: privileges.php,v 1.9 2003/03/23 03:13:57 chriskl Exp $
         */
 
        // Include application functions
@@ -241,43 +241,43 @@
                switch ($_REQUEST['type']) {
                        case 'table':
                                echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?action=grantuser&{$misc->href}&type={$_REQUEST['type']}&object=",
-                                       htmlspecialchars($_REQUEST['object']), "&table=", htmlspecialchars($_REQUEST['table']), "\">{$lang['strgrantuser']}</a> |\n";
+                                       urlencode($_REQUEST['object']), "&table=", urlencode($_REQUEST['table']), "\">{$lang['strgrantuser']}</a> |\n";
                                echo "<a class=\"navlink\" href=\"{$PHP_SELF}?action=grantgroup&{$misc->href}&type={$_REQUEST['type']}&object=",
-                                       htmlspecialchars($_REQUEST['object']), "&table=", htmlspecialchars($_REQUEST['table']), "\">{$lang['strgrantgroup']}</a>\n";
+                                       urlencode($_REQUEST['object']), "&table=", urlencode($_REQUEST['table']), "\">{$lang['strgrantgroup']}</a>\n";
                                break;
                        case 'view':
                                echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?action=grantuser&{$misc->href}&type={$_REQUEST['type']}&object=",
-                                       htmlspecialchars($_REQUEST['object']), "\">{$lang['strgrantuser']}</a> |\n";
+                                       urlencode($_REQUEST['object']), "\">{$lang['strgrantuser']}</a> |\n";
                                echo "<a class=\"navlink\" href=\"{$PHP_SELF}?action=grantgroup&{$misc->href}&type={$_REQUEST['type']}&object=",
-                                       htmlspecialchars($_REQUEST['object']), "\">{$lang['strgrantgroup']}</a>\n";
+                                       urlencode($_REQUEST['object']), "\">{$lang['strgrantgroup']}</a>\n";
                                echo "| <a class=\"navlink\" href=\"views.php?{$misc->href}\">{$lang['strshowallviews']}</a></p>\n";
                                break;
                        case 'sequence':
                                echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?action=grantuser&{$misc->href}&type={$_REQUEST['type']}&object=",
-                                       htmlspecialchars($_REQUEST['object']), "\">{$lang['strgrantuser']}</a> |\n";
+                                       urlencode($_REQUEST['object']), "\">{$lang['strgrantuser']}</a> |\n";
                                echo "<a class=\"navlink\" href=\"{$PHP_SELF}?action=grantgroup&{$misc->href}&type={$_REQUEST['type']}&object=",
-                                       htmlspecialchars($_REQUEST['object']), "\">{$lang['strgrantgroup']}</a>\n";
+                                       urlencode($_REQUEST['object']), "\">{$lang['strgrantgroup']}</a>\n";
                                echo "| <a class=\"navlink\" href=\"sequences.php?{$misc->href}\">{$lang['strshowallsequences']}</a></p>\n";
                                break;
                        case 'database':
                                echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?action=grantuser&{$misc->href}&type={$_REQUEST['type']}&object=",
-                                       htmlspecialchars($_REQUEST['object']), "\">{$lang['strgrantuser']}</a> |\n";
+                                       urlencode($_REQUEST['object']), "\">{$lang['strgrantuser']}</a> |\n";
                                echo "<a class=\"navlink\" href=\"{$PHP_SELF}?action=grantgroup&{$misc->href}&type={$_REQUEST['type']}&object=",
-                                       htmlspecialchars($_REQUEST['object']), "\">{$lang['strgrantgroup']}</a>\n";
+                                       urlencode($_REQUEST['object']), "\">{$lang['strgrantgroup']}</a>\n";
                                break;
                        case 'function':
                                echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?action=grantuser&{$misc->href}&type={$_REQUEST['type']}&object=",
-                                       htmlspecialchars($_REQUEST['object']), "&function=", htmlspecialchars($_REQUEST['function']), "\">{$lang['strgrantuser']}</a> |\n";
+                                       urlencode($_REQUEST['object']), "&function=", urlencode($_REQUEST['function']), "\">{$lang['strgrantuser']}</a> |\n";
                                echo "<a class=\"navlink\" href=\"{$PHP_SELF}?action=grantgroup&{$misc->href}&type={$_REQUEST['type']}&object=",
-                                       htmlspecialchars($_REQUEST['object']), "&function=", htmlspecialchars($_REQUEST['function']), "\">{$lang['strgrantgroup']}</a>\n";
+                                       urlencode($_REQUEST['object']), "&function=", urlencode($_REQUEST['function']), "\">{$lang['strgrantgroup']}</a>\n";
                                echo "| <a class=\"navlink\" href=\"functions.php?{$misc->href}\">{$lang['strshowallfunctions']}</a></p>\n";
                                break;
                        case 'schema':
                                echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?action=grantuser&{$misc->href}&type={$_REQUEST['type']}&object=",
-                                       htmlspecialchars($_REQUEST['object']), "\">{$lang['strgrantuser']}</a> |\n";
+                                       urlencode($_REQUEST['object']), "\">{$lang['strgrantuser']}</a> |\n";
                                echo "<a class=\"navlink\" href=\"{$PHP_SELF}?action=grantgroup&{$misc->href}&type={$_REQUEST['type']}&object=",
-                                       htmlspecialchars($_REQUEST['object']), "\">{$lang['strgrantgroup']}</a>\n";
-                               echo "| <a class=\"navlink\" href=\"database.php?database=", htmlspecialchars($_REQUEST['database']),
+                                       urlencode($_REQUEST['object']), "\">{$lang['strgrantgroup']}</a>\n";
+                               echo "| <a class=\"navlink\" href=\"database.php?database=", urlencode($_REQUEST['database']),
                                        "\">{$lang['strshowallschemas']}</a></p>\n";
                                break;
                }

diff --git a/rules.php b/rules.php
index 408780b9e05af67ea291197e8a2dd3188a6a8aa3..96be6c3f1ee16fb2f3220e4fc50242690400b18e 100644 (file)
--- a/rules.php
+++ b/rules.php
@@ -3,7 +3,7 @@
        /**
         * List rules on a table
         *
-        * $Id: rules.php,v 1.6 2003/03/17 09:25:44 chriskl Exp $
+        * $Id: rules.php,v 1.7 2003/03/23 03:13:57 chriskl Exp $
         */
 
        // Include application functions
@@ -135,8 +135,8 @@
                                echo "<tr><td class=\"data{$id}\">", htmlspecialchars( $rules->f[$data->rlFields['rulename']]), "</td>";
                                echo "<td class=\"data{$id}\">", htmlspecialchars( $rules->f[$data->rlFields['ruledef']]), "</td>";
                                echo "<td class=\"data{$id}\">";
-                               echo "<a href=\"$PHP_SELF?action=confirm_drop&{$misc->href}&rule=", htmlspecialchars( $rules->f[$data->rlFields['rulename']]),
-                                       "&table=", htmlspecialchars($_REQUEST['table']), "\">{$lang['strdrop']}</td></tr>\n";
+                               echo "<a href=\"$PHP_SELF?action=confirm_drop&{$misc->href}&rule=", urlencode($rules->f[$data->rlFields['rulename']]),
+                                       "&table=", urlencode($_REQUEST['table']), "\">{$lang['strdrop']}</td></tr>\n";
 
                                $rules->movenext();
                                $i++;
@@ -147,7 +147,7 @@
                else
                        echo "<p>{$lang['strnorules']}</p>\n";
 
-               echo "<p><a href=\"{$PHP_SELF}?action=create_rule&{$misc->href}&table=", htmlspecialchars($_REQUEST['table']),
+               echo "<p><a href=\"{$PHP_SELF}?action=create_rule&{$misc->href}&table=", urlencode($_REQUEST['table']),
                        "\">{$lang['strcreaterule']}</a></p>\n";
        }
 

diff --git a/schema.php b/schema.php
index 817a9498e815dd3e3c0f96e623846054ef5833e6..b0c9df29c521ffdc9b05389f1f2c76b1f8a1faee 100755 (executable)
--- a/schema.php
+++ b/schema.php
@@ -3,7 +3,7 @@
        /**
         * Manage schemas within a database
         *
-        * $Id: schema.php,v 1.2 2003/03/17 05:20:30 chriskl Exp $
+        * $Id: schema.php,v 1.3 2003/03/23 03:13:57 chriskl Exp $
         */
 
        // Include application functions
@@ -152,11 +152,11 @@
                                        echo "<tr><td class=data{$id}>", htmlspecialchars($schemas->f[$data->nspFields['nspname']]), "</td>\n";
                                        echo "<td class=data{$id}>", htmlspecialchars($schemas->f[$data->nspFields['nspowner']]), "</td>\n";
                                        echo "<td class=opbutton{$id}><a href=\"$PHP_SELF?action=confirm_drop&database=",
-                                               htmlspecialchars($_REQUEST['database']), "&schema=",
-                                               htmlspecialchars($schemas->f[$data->nspFields['nspname']]), "\">{$lang['strdrop']}</a></td>\n";
+                                               urlencode($_REQUEST['database']), "&schema=",
+                                               urlencode($schemas->f[$data->nspFields['nspname']]), "\">{$lang['strdrop']}</a></td>\n";
                                        echo "<td class=opbutton{$id}><a href=\"privileges.php?database=",
-                                               htmlspecialchars($_REQUEST['database']), "&object=",
-                                               htmlspecialchars($schemas->f[$data->nspFields['nspname']]), "&type=schema\">{$lang['strprivileges']}</a></td>\n";
+                                               urlencode($_REQUEST['database']), "&object=",
+                                               urlencode($schemas->f[$data->nspFields['nspname']]), "&type=schema\">{$lang['strprivileges']}</a></td>\n";
                                        echo "</tr>\n";
                                        $schemas->moveNext();
                                        $i++;

diff --git a/sequences.php b/sequences.php
index 6914dfa357d6550671c6b1fc5ebb3880446e0886..317a6b448b18166638683396402409ee822d153d 100644 (file)
--- a/sequences.php
+++ b/sequences.php
@@ -3,7 +3,7 @@
        /**
         * Manage sequences in a database
         *
-        * $Id: sequences.php,v 1.7 2003/03/18 07:35:11 chriskl Exp $
+        * $Id: sequences.php,v 1.8 2003/03/23 03:13:57 chriskl Exp $
         */
        
        // Include application functions
@@ -36,11 +36,11 @@
                                echo "<tr><td class=\"data{$id}\">", htmlspecialchars($sequences->f[$data->sqFields['seqname']]), "</td>";
                                echo "<td class=\"data{$id}\">", htmlspecialchars($sequences->f[$data->sqFields['seqowner']]), "</td>";
                                echo "<td class=\"data{$id}\">";
-                               echo "<a href=\"$PHP_SELF?action=properties&{$misc->href}&sequence=", htmlspecialchars($sequences->f[$data->sqFields['seqname']]), "\">{$lang['strproperties']}</a></td>\n"; 
+                               echo "<a href=\"$PHP_SELF?action=properties&{$misc->href}&sequence=", urlencode($sequences->f[$data->sqFields['seqname']]), "\">{$lang['strproperties']}</a></td>\n"; 
                                echo "<td class=\"data{$id}\">";
-                               echo "<a href=\"$PHP_SELF?action=confirm_drop&{$misc->href}&sequence=", htmlspecialchars($sequences->f[$data->sqFields['seqname']]), "\">{$lang['strdrop']}</td>\n"; 
+                               echo "<a href=\"$PHP_SELF?action=confirm_drop&{$misc->href}&sequence=", urlencode($sequences->f[$data->sqFields['seqname']]), "\">{$lang['strdrop']}</td>\n"; 
                                echo "<td class=\"data{$id}\">";
-                               echo "<a href=\"privileges.php?{$misc->href}&object=", htmlspecialchars($sequences->f[$data->sqFields['seqname']]),
+                               echo "<a href=\"privileges.php?{$misc->href}&object=", urlencode($sequences->f[$data->sqFields['seqname']]),
                                "&type=sequence\">{$lang['strprivileges']}</td></tr>\n";
                                
                                $sequences->movenext();
@@ -84,7 +84,7 @@
                        echo "</tr>";
                        echo "</table>";
                        
-                       echo "<p><a href=\"{$PHP_SELF}?action=reset&{$misc->href}&sequence=", htmlspecialchars($sequence->f[$data->sqFields['seqname']]), "\">{$lang['strreset']}</a> |\n";
+                       echo "<p><a href=\"{$PHP_SELF}?action=reset&{$misc->href}&sequence=", urlencode($sequence->f[$data->sqFields['seqname']]), "\">{$lang['strreset']}</a> |\n";
                        echo "<a href=\"{$PHP_SELF}?{$misc->href}\">{$lang['strshowallsequences']}</a></p>\n";
                }
                else echo "<p>{$lang['strnodata']}.</p>\n";

diff --git a/tables.php b/tables.php
index 185cc17fdb2a462e6552b1cdaf319b88a590ab17..89d35dd67a3228b5fbb5c29f6d417f0ce198a088 100644 (file)
--- a/tables.php
+++ b/tables.php
@@ -3,7 +3,7 @@
        /**
         * List tables in a database
         *
-        * $Id: tables.php,v 1.9 2003/03/17 05:20:30 chriskl Exp $
+        * $Id: tables.php,v 1.10 2003/03/23 03:13:57 chriskl Exp $
         */
 
        // Include application functions
@@ -564,13 +564,13 @@
                                echo "<tr><td class=data{$id}>", htmlspecialchars($tables->f[$data->tbFields['tbname']]), "</td>\n";
                                echo "<td class=data{$id}>", htmlspecialchars($tables->f[$data->tbFields['tbowner']]), "</td>\n";
                                echo "<td class=opbutton{$id}><a href=\"{$PHP_SELF}?action=browse&page=1&{$misc->href}&table=",
-                                       htmlspecialchars($tables->f[$data->tbFields['tbname']]), "\">{$lang['strbrowse']}</a></td>\n";
+                                       urlencode($tables->f[$data->tbFields['tbname']]), "\">{$lang['strbrowse']}</a></td>\n";
                                echo "<td class=opbutton{$id}><a href=\"$PHP_SELF?action=confselectrows&{$misc->href}&table=",
                                        urlencode($tables->f[$data->tbFields['tbname']]), "\">{$lang['strselect']}</a></td>\n";
                                echo "<td class=opbutton{$id}><a href=\"$PHP_SELF?action=confinsertrow&{$misc->href}&table=",
                                        urlencode($tables->f[$data->tbFields['tbname']]), "\">{$lang['strinsert']}</a></td>\n";
                                echo "<td class=opbutton{$id}><a href=\"tblproperties.php?{$misc->href}&table=",
-                                       htmlspecialchars($tables->f[$data->tbFields['tbname']]), "\">{$lang['strproperties']}</a></td>\n";
+                                       urlencode($tables->f[$data->tbFields['tbname']]), "\">{$lang['strproperties']}</a></td>\n";
                                echo "<td class=opbutton{$id}><a href=\"$PHP_SELF?action=confirm_empty&{$misc->href}&table=",
                                        urlencode($tables->f[$data->tbFields['tbname']]), "\">{$lang['strempty']}</a></td>\n";
                                echo "<td class=opbutton{$id}><a href=\"$PHP_SELF?action=confirm_drop&{$misc->href}&table=",

diff --git a/tblproperties.php b/tblproperties.php
index 75bf09bb70544eb14d9db0dc518e867950983812..91030abb1f03c25f7006d3f87189283253743fef 100644 (file)
--- a/tblproperties.php
+++ b/tblproperties.php
@@ -3,7 +3,7 @@
        /**
         * List tables in a database
         *
-        * $Id: tblproperties.php,v 1.9 2003/03/23 01:08:05 xzilla Exp $
+        * $Id: tblproperties.php,v 1.10 2003/03/23 03:13:57 chriskl Exp $
         */
 
        // Include application functions
@@ -233,7 +233,7 @@
        }
 
        /**
-        * Show default list of tables in the database
+        * Show default list of columns in the table
         */
        function doDefault($msg = '') {
                global $data, $localData, $misc;
@@ -243,6 +243,7 @@
                echo "<h2>", htmlspecialchars($_REQUEST['database']), ": ", htmlspecialchars($_REQUEST['table']), "</h2>\n";
 
                $attrs = &$localData->getTableAttributes($_REQUEST['table']);
+               $misc->printMsg($msg);
 
                if ($attrs->recordCount() > 0) {
                        echo "<table>\n";
@@ -255,10 +256,10 @@
                                echo "<td class=data{$id}>", htmlspecialchars($attrs->f['type']), "</td>\n";
                                echo "<td class=data{$id}>", ($attrs->f['attnotnull'] ? 'NOT NULL' : ''), "</td>\n";
                                echo "<td class=data{$id}>", htmlspecialchars($attrs->f['adsrc']), "</td>\n";
-                               echo "<td class=opbutton{$id}><a href=\"{$PHP_SELF}?{$misc->href}&table=", htmlspecialchars($_REQUEST['table']),
-                                       "&column=", htmlspecialchars($attrs->f['attname']), "&action=properties\">{$lang['strproperties']}</a></td>\n";
-                               echo "<td class=opbutton{$id}><a href=\"{$PHP_SELF}?{$misc->href}&table=", htmlspecialchars($_REQUEST['table']),
-                                       "&column=", htmlspecialchars($attrs->f['attname']), "&action=confirm_drop\">{$lang['strdrop']}</a></td>\n";
+                               echo "<td class=opbutton{$id}><a href=\"{$PHP_SELF}?{$misc->href}&table=", urlencode($_REQUEST['table']),
+                                       "&column=", urlencode($attrs->f['attname']), "&action=properties\">{$lang['strproperties']}</a></td>\n";
+                               echo "<td class=opbutton{$id}><a href=\"{$PHP_SELF}?{$misc->href}&table=", htmlentities($_REQUEST['table']),
+                                       "&column=", htmlentities($attrs->f['attname']), "&action=confirm_drop\">{$lang['strdrop']}</a></td>\n";
                                echo "</tr>\n";
                                $attrs->moveNext();
                                $i++;
@@ -281,7 +282,7 @@
 
        $misc->printHeader($lang['strtables'] . ' - ' . $_REQUEST['table']);
        $misc->printBody();
-       
+
        switch ($action) {
                case 'export':
                        doExport();

diff --git a/triggers.php b/triggers.php
index e885ae6fc5d10a342f0457764e360d5f1ef442b2..9459dd3f4a72d12c7265e50915f0cdbc7d006be8 100644 (file)
--- a/triggers.php
+++ b/triggers.php
@@ -3,7 +3,7 @@
        /**
         * List triggers on a table
         *
-        * $Id: triggers.php,v 1.7 2003/03/22 15:17:58 chriskl Exp $
+        * $Id: triggers.php,v 1.8 2003/03/23 03:13:57 chriskl Exp $
         */
 
        // Include application functions
@@ -88,7 +88,7 @@
                        doDefault($lang['strnofunctions']);
                        return;
                }
-               
+
                /* Populate functions */
                $sel0 = new XHTML_Select('formFunction');
                while (!$funcs->EOF) {
@@ -180,8 +180,8 @@
                                echo "<tr><td class=\"data{$id}\">", htmlspecialchars( $triggers->f[$data->tgFields['tgname']]), "</td>";
                                echo "<td class=\"data{$id}\">", htmlspecialchars( $triggers->f[$data->tgFields['tgdef']]), "</td>";
                                echo "<td class=\"data{$id}\">";
-                               echo "<a href=\"$PHP_SELF?action=confirm_drop&{$misc->href}&trigger=", htmlspecialchars( $triggers->f[$data->tgFields['tgname']]),
-                                       "&table=", htmlspecialchars($_REQUEST['table']), "\">{$lang['strdrop']}</td></tr>\n";
+                               echo "<a href=\"$PHP_SELF?action=confirm_drop&{$misc->href}&trigger=", urlencode( $triggers->f[$data->tgFields['tgname']]),
+                                       "&table=", urlencode($_REQUEST['table']), "\">{$lang['strdrop']}</td></tr>\n";
 
                                $triggers->moveNext();
                                $i++;
@@ -191,11 +191,12 @@
                        }
                else
                        echo "<p>{$lang['strnotriggers']}</p>\n";
-               
-               echo "<p><a class=\"navlink\" href=\"$PHP_SELF?action=create&{$misc->href}&table=", htmlspecialchars($_REQUEST['table']), "\">{$lang['strcreatetrigger']}</a></p>\n";
+
+               echo "<p><a class=\"navlink\" href=\"$PHP_SELF?action=create&{$misc->href}&table=", urlencode($_REQUEST['table']), "\">{$lang['strcreatetrigger']}</a></p>\n";
        }
 
        $misc->printHeader($lang['strtables'] . ' - ' . $_REQUEST['table'] . ' - ' . $lang['strtriggers']);
+       $misc->printBody();
 
        switch ($action) {
                case 'save_create':