Modified help refs for new help system.

diff --git a/aggregates.php b/aggregates.php
index b41acc8afd555444f2123cde38552fb30ab5c593..cd4493493e9a9d18182a141bd2cb4268817ef3f1 100644 (file)
--- a/aggregates.php
+++ b/aggregates.php
@@ -3,7 +3,7 @@
        /**
         * Manage aggregates in a database
         *
-        * $Id: aggregates.php,v 1.8 2004/09/01 16:35:57 jollytoad Exp $
+        * $Id: aggregates.php,v 1.9 2004/09/07 13:58:21 jollytoad Exp $
         */
 
        // Include application functions
@@ -20,7 +20,7 @@
                global $lang;
 
                $misc->printTrail('schema');
-               $misc->printTabs('schema', 'aggregates');
+               $misc->printTabs('schema', 'pg.aggregate');
                $misc->printMsg($msg);
                
                $aggregates = &$data->getAggregates();

diff --git a/all_db.php b/all_db.php
index 1ed8720d9103d28c08cf327b6b6d04fefe8f7bb1..d6161e1501786555e985592b071c1d8755ec5887 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.34 2004/09/01 16:35:57 jollytoad Exp $
+        * $Id: all_db.php,v 1.35 2004/09/07 13:58:21 jollytoad Exp $
         */
 
        // Include application functions
@@ -22,7 +22,7 @@
 
                if ($confirm) {
                        $misc->printTrail('database');
-                       $misc->printTitle($lang['strdrop'], 'drop_database');
+                       $misc->printTitle($lang['strdrop'], 'pg.database.drop');
                        
                        echo "<p>", sprintf($lang['strconfdropdatabase'], $misc->printVal($_REQUEST['database'])), "</p>\n";    
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
@@ -53,7 +53,7 @@
                global $PHP_SELF, $lang;
                
                $misc->printTrail('server');
-               $misc->printTitle($lang['strcreatedatabase'], 'create_database');
+               $misc->printTitle($lang['strcreatedatabase'], 'pg.database.create');
                $misc->printMsg($msg);
                
                if (!isset($_POST['formName'])) $_POST['formName'] = '';

diff --git a/constraints.php b/constraints.php
index 8dcdaf7e2425fb39beffc153228f5037bc84f20f..85776870df14a1747ad154087750a9da4d5b5857 100644 (file)
--- a/constraints.php
+++ b/constraints.php
@@ -3,7 +3,7 @@
        /**
         * List constraints on a table
         *
-        * $Id: constraints.php,v 1.39 2004/09/01 16:35:57 jollytoad Exp $
+        * $Id: constraints.php,v 1.40 2004/09/07 13:58:21 jollytoad Exp $
         */
 
        // Include application functions
@@ -42,7 +42,7 @@
                                        $_REQUEST['target'] = unserialize($_REQUEST['target']);
                                        
                                        $misc->printTrail('table');
-                                       $misc->printTitle($lang['straddfk']);
+                                       $misc->printTitle($lang['straddfk'],'pg.constraint.foreign_key');
                                        $misc->printMsg($msg);
 
                                        // Unserialize target and fetch appropriate table. This is a bit messy
@@ -150,7 +150,7 @@
                                break;
                        default:
                                $misc->printTrail('table');
-                               $misc->printTitle($lang['straddfk']);
+                               $misc->printTitle($lang['straddfk'],'pg.constraint.foreign_key');
                                $misc->printMsg($msg);
 
                                $attrs = &$data->getTableAttributes($_REQUEST['table']);
@@ -227,21 +227,27 @@
                if ($confirm) {
                        if (!isset($_POST['name'])) $_POST['name'] = '';
                        if (!isset($_POST['tablespace'])) $_POST['tablespace'] = '';
-
-                       if ($type == 'primary') $desc = $lang['straddpk'];
-                       elseif ($type == 'unique') $desc = $lang['stradduniq'];
-                       else {
-                               doDefault($lang['strinvalidparam']);
-                               return;
+                       
+                       $misc->printTrail('table');
+                       
+                       switch ($type) {
+                               case 'primary':
+                                       $misc->printTitle($lang['straddpk'],'pg.constraint.primary_key');
+                                       break;
+                               case 'unique':
+                                       $misc->printTitle($lang['stradduniq'],'pg.constraint.unique_key');
+                                       break;
+                               default:
+                                       doDefault($lang['strinvalidparam']);
+                                       return;
                        }
                        
+                       $misc->printMsg($msg);
+                       
                        $attrs = &$data->getTableAttributes($_REQUEST['table']);
                        // Fetch all tablespaces from the database
                        if ($data->hasTablespaces()) $tablespaces = &$data->getTablespaces();
 
-                       $misc->printTrail('table');
-                       $misc->printTitle($desc);
-                       $misc->printMsg($msg);
                        
                        $selColumns = new XHTML_select('TableColumnList', true, 10);
                        $selColumns->set_style('width: 10em;');
@@ -347,7 +353,7 @@
 
                if ($confirm) {
                        $misc->printTrail('table');
-                       $misc->printTitle($lang['straddcheck']);
+                       $misc->printTitle($lang['straddcheck'],'pg.constraint.check');
                        $misc->printMsg($msg);
 
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
@@ -393,7 +399,7 @@
 
                if ($confirm) {
                        $misc->printTrail('constraint');
-                       $misc->printTitle($lang['strdrop'],'constraint');
+                       $misc->printTitle($lang['strdrop'],'pg.constraint.drop');
 
                        echo "<p>", sprintf($lang['strconfdropconstraint'], $misc->printVal($_REQUEST['constraint']),
                                $misc->printVal($_REQUEST['table'])), "</p>\n";

diff --git a/database.php b/database.php
index d00ca4bb2cf16eb8d35dbdd08bf9aebf81138b12..3ff15be41ed8ef4e5571891cc2179f7eaa3447e1 100755 (executable)
--- a/database.php
+++ b/database.php
@@ -3,7 +3,7 @@
        /**
         * Manage schemas within a database
         *
-        * $Id: database.php,v 1.62 2004/09/01 16:35:58 jollytoad Exp $
+        * $Id: database.php,v 1.63 2004/09/07 13:58:21 jollytoad Exp $
         */
 
        // Include application functions
@@ -437,7 +437,9 @@
                                
                                // Vacuum
                                echo "<form name=\"adminfrm\" id=\"adminfrm\" action=\"{$PHP_SELF}\" method=\"post\">\n";
-                               echo "<h3>{$lang['strvacuum']}</h3>\n";
+                               echo "<h3>";
+                               $misc->printHelp($lang['strvacuum'],'pg.admin.vacuum');
+                               echo "</h3>\n";
                                echo "<input type=\"checkbox\" id=\"vacuum_analyze\" name=\"vacuum_analyze\" />{$lang['stranalyze']}<br />\n";
                                if ($data->hasFullVacuum()) {
                                        echo "<input type=\"checkbox\" id=\"vacuum_full\" name=\"vacuum_full\" />{$lang['strfull']}<br />\n";                           
@@ -450,16 +452,20 @@
 
                                // Analyze
                                echo "<form name=\"adminfrm\" id=\"adminfrm\" action=\"{$PHP_SELF}\" method=\"post\">\n";
-                               echo "<h3>{$lang['stranalyze']}</h3>\n";                                
+                               echo "<h3>";
+                               $misc->printHelp($lang['stranalyze'],'pg.admin.analyze');
+                               echo "</h3>\n";
                                echo "<input type=\"submit\" value=\"{$lang['stranalyze']}\" />\n";
                                echo "<input type=\"hidden\" name=\"action\" value=\"analyze\" />\n";
                                echo $misc->form;
-                               echo "</form>\n";                                                               
+                               echo "</form>\n";
                                
                                // Recluster
                                if ($data->hasRecluster()){
                                        echo "<form name=\"adminfrm\" id=\"adminfrm\" action=\"{$PHP_SELF}\" method=\"post\">\n";
-                                       echo "<h3>{$lang['strcluster']}</h3>\n";
+                                       echo "<h3>";
+                                       $misc->printHelp($lang['strcluster'],'pg.index.cluster');
+                                       echo "</h3>\n";
                                        echo "<input type=\"submit\" value=\"{$lang['strcluster']}\" />\n";
                                        echo "<input type=\"hidden\" name=\"action\" value=\"recluster\" />\n";
                                        echo $misc->form;
@@ -468,12 +474,14 @@
                                
                                // Reindex
                                echo "<form name=\"adminfrm\" id=\"adminfrm\" action=\"{$PHP_SELF}\" method=\"post\">\n";
-                               echo "<h3>{$lang['strreindex']}</h3>\n";
+                               echo "<h3>";
+                               $misc->printHelp($lang['strreindex'],'pg.index.reindex');
+                               echo "</h3>\n";
                                echo "<input type=\"checkbox\" id=\"reindex_force\" name=\"reindex_force\" />{$lang['strforce']}<br />\n";
                                echo "<input type=\"submit\" value=\"{$lang['strreindex']}\" />\n";
                                echo "<input type=\"hidden\" name=\"action\" value=\"reindex\" />\n";
                                echo $misc->form;
-                               echo "</form>\n";                               
+                               echo "</form>\n";
                                break;
                }
        }
@@ -533,7 +541,7 @@
 
                if ($confirm) {
                        $misc->printTrail('schema');
-                       $misc->printTitle($lang['strdrop'],'drop_schema');
+                       $misc->printTitle($lang['strdrop'],'pg.schema.drop');
 
                        echo "<p>", sprintf($lang['strconfdropschema'], $misc->printVal($_REQUEST['schema'])), "</p>\n";
 
@@ -579,7 +587,7 @@
                if ($data->hasTablespaces()) $tablespaces = &$data->getTablespaces();
 
                $misc->printTrail('database');
-               $misc->printTitle($lang['strcreateschema'],'create_schema');
+               $misc->printTitle($lang['strcreateschema'],'pg.schema.create');
                $misc->printMsg($msg);
                
                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
@@ -669,7 +677,7 @@
 
                        $columns = array(
                                'schema' => array(
-                                       'title' => $lang['strname'],
+                                       'title' => $lang['strschema'],
                                        'field' => 'nspname',
                                ),
                                'owner' => array(
@@ -732,7 +740,7 @@
                global $data, $misc,$PHP_SELF, $lang;
                
                $misc->printTrail('schema');
-               $misc->printTitle($lang['stralter'],'alter_schema');
+               $misc->printTitle($lang['stralter'],'pg.schema.alter');
                $misc->printMsg($msg);
 
                $schema = &$data->getSchemaByName($_REQUEST['schema']);

diff --git a/domains.php b/domains.php
index a8b9130060c3b19d83eb5aeebbb1944969fccd53..f9d5ef3a3f76f0439fdeac5428485bd6ccb585f8 100644 (file)
--- a/domains.php
+++ b/domains.php
@@ -3,7 +3,7 @@
        /**
         * Manage domains in a database
         *
-        * $Id: domains.php,v 1.18 2004/09/01 16:35:58 jollytoad Exp $
+        * $Id: domains.php,v 1.19 2004/09/07 13:58:21 jollytoad Exp $
         */
 
        // Include application functions
@@ -35,7 +35,7 @@
                global $PHP_SELF, $lang;
        
                $misc->printTrail('domain');
-               $misc->printTitle($lang['stralter']);
+               $misc->printTitle($lang['stralter'],'pg.domain.alter');
                $misc->printMsg($msg);
                
                // Fetch domain info
@@ -96,7 +96,7 @@
 
                if ($confirm) {
                        $misc->printTrail('domain');
-                       $misc->printTitle($lang['straddcheck']);
+                       $misc->printTitle($lang['straddcheck'],'pg.constraint.check');
                        $misc->printMsg($msg);
 
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
@@ -142,7 +142,7 @@
 
                if ($confirm) {
                        $misc->printTrail('domain');
-                       $misc->printTitle($lang['strdrop']);
+                       $misc->printTitle($lang['strdrop'],'pg.constraint.drop');
                        $misc->printMsg($msg);
                        
                        echo "<p>", sprintf($lang['strconfdropconstraint'], $misc->printVal($_REQUEST['constraint']), 
@@ -178,7 +178,7 @@
                global $PHP_SELF, $lang;
        
                $misc->printTrail('domain');
-               $misc->printTitle($lang['strproperties']);
+               $misc->printTitle($lang['strproperties'],'pg.domain');
                $misc->printMsg($msg);
                
                $domaindata = &$data->getDomain($_REQUEST['domain']);
@@ -251,7 +251,7 @@
 
                if ($confirm) {
                        $misc->printTrail('domain');
-                       $misc->printTitle($lang['strdrop']);
+                       $misc->printTitle($lang['strdrop'],'pg.domain.drop');
                        
                        echo "<p>", sprintf($lang['strconfdropdomain'], $misc->printVal($_REQUEST['domain'])), "</p>\n";        
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
@@ -293,7 +293,7 @@
                $types = &$data->getTypes(true);
                
                $misc->printTrail('schema');
-               $misc->printTitle($lang['strcreatedomain']);
+               $misc->printTitle($lang['strcreatedomain'],'pg.domain.create');
                $misc->printMsg($msg);
 
                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";

diff --git a/functions.php b/functions.php
index d0a1c3b8e3d6119c850acaeb549c5d477de337de..c0254ddc5dd35654ca4de0b3636ace688bf335a7 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -3,7 +3,7 @@
        /**
         * Manage functions in a database
         *
-        * $Id: functions.php,v 1.44 2004/09/01 16:35:58 jollytoad Exp $
+        * $Id: functions.php,v 1.45 2004/09/07 13:58:21 jollytoad Exp $
         */
 
        // Include application functions
@@ -48,7 +48,7 @@
                global $PHP_SELF, $lang;
                
                $misc->printTrail('function');
-               $misc->printTitle($lang['stralter']);
+               $misc->printTitle($lang['stralter'],'pg.function.alter');
                $misc->printMsg($msg);
 
                $fndata = &$data->getFunction($_REQUEST['function_oid']);
@@ -176,7 +176,7 @@
                global $PHP_SELF, $lang;
                
                $misc->printTrail('function');
-               $misc->printTitle($lang['strproperties'],'functions');
+               $misc->printTitle($lang['strproperties'],'pg.function');
                $misc->printMsg($msg);
                
                $funcdata = &$data->getFunction($_REQUEST['function_oid']);
@@ -274,7 +274,7 @@
 
                if ($confirm) {
                        $misc->printTrail('schema');
-                       $misc->printTitle($lang['strdrop'],'drop_function');
+                       $misc->printTitle($lang['strdrop'],'pg.function.drop');
                        
                        echo "<p>", sprintf($lang['strconfdropfunction'], $misc->printVal($_REQUEST['function'])), "</p>\n";    
                        
@@ -327,15 +327,15 @@
 
                switch ($fnlang) {
                        case 'c':
-                               $desc = $lang['strcreatecfunction'];
+                               $misc->printTitle($lang['strcreatecfunction'],'pg.function.create.c');
                                break;
                        case 'internal':
-                               $desc = $lang['strcreateinternalfunction'];
+                               $misc->printTitle($lang['strcreateinternalfunction'],'pg.function.create.internal');
                                break;
                        default:
-                               $desc = $lang['strcreateplfunction'];
+                               $misc->printTitle($lang['strcreateplfunction'],'pg.function.create.pl');
+                               break;
                }
-               $misc->printTitle($desc, 'functions');
                $misc->printMsg($msg);
 
                echo "<form action=\"$PHP_SELF\" method=post>\n";

diff --git a/groups.php b/groups.php
index 30a12ebec602d9a7be4b0b7a0af56fd0c6f4a233..8ba7318e6dc08847abd4e846a5a705482c198354 100644 (file)
--- a/groups.php
+++ b/groups.php
@@ -3,7 +3,7 @@
        /**
         * Manage groups in a database cluster
         *
-        * $Id: groups.php,v 1.18 2004/09/01 16:35:58 jollytoad Exp $
+        * $Id: groups.php,v 1.19 2004/09/07 13:58:21 jollytoad Exp $
         */
 
        // Include application functions
@@ -36,7 +36,7 @@
 
                if ($confirm) { 
                        $misc->printTrail('group');
-                       $misc->printTitle($lang['strdropmember']);
+                       $misc->printTitle($lang['strdropmember'],'pg.group.alter');
                        
                        echo "<p>", sprintf($lang['strconfdropmember'], $misc->printVal($_REQUEST['user']), $misc->printVal($_REQUEST['group'])), "</p>\n";
                        
@@ -67,7 +67,7 @@
                if (!isset($_POST['user'])) $_POST['user'] = '';
        
                $misc->printTrail('group');
-               $misc->printTitle($lang['strproperties'],'groups');
+               $misc->printTitle($lang['strproperties'],'pg.group');
                $misc->printMsg($msg);
                
                $groupdata = &$data->getGroup($_REQUEST['group']);
@@ -117,7 +117,7 @@
 
                if ($confirm) {
                        $misc->printTrail('group');
-                       $misc->printTitle($lang['strdrop']);
+                       $misc->printTitle($lang['strdrop'],'pg.group.drop');
                        
                        echo "<p>", sprintf($lang['strconfdropgroup'], $misc->printVal($_REQUEST['group'])), "</p>\n";
                        
@@ -151,7 +151,7 @@
                $users = &$data->getUsers();
                
                $misc->printTrail('server');
-               $misc->printTitle($lang['strcreategroup'],'groups');
+               $misc->printTitle($lang['strcreategroup'],'pg.group.create');
                $misc->printMsg($msg);
 
                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";

diff --git a/indexes.php b/indexes.php
index fee22a282d616631096a3c704b23f4fb26649640..a3c1d7c73fc3a42abdf9851776fa7c4d02828025 100644 (file)
--- a/indexes.php
+++ b/indexes.php
@@ -3,7 +3,7 @@
        /**
         * List indexes on a table
         *
-        * $Id: indexes.php,v 1.33 2004/09/01 16:35:58 jollytoad Exp $
+        * $Id: indexes.php,v 1.34 2004/09/07 13:58:21 jollytoad Exp $
         */
 
        // Include application functions
@@ -25,7 +25,7 @@
                        $_REQUEST['analyze'] = true;
                        
                        $misc->printTrail('index');
-                       $misc->printTitle($lang['strcluster']);
+                       $misc->printTitle($lang['strcluster'],'pg.index.cluster');
 
                        echo "<p>", sprintf($lang['strconfcluster'], $misc->printVal($_REQUEST['index'])), "</p>\n";
 
@@ -84,7 +84,7 @@
                if ($data->hasTablespaces()) $tablespaces = &$data->getTablespaces();
                
                $misc->printTrail('table');
-               $misc->printTitle($lang['strcreateindex']);
+               $misc->printTitle($lang['strcreateindex'],'pg.index.create');
                $misc->printMsg($msg);
 
                $selColumns = new XHTML_select("TableColumnList",true,10);
@@ -207,7 +207,7 @@
 
                if ($confirm) {
                        $misc->printTrail('index');
-                       $misc->printTitle($lang['strdrop']);
+                       $misc->printTitle($lang['strdrop'],'pg.index.drop');
 
                        echo "<p>", sprintf($lang['strconfdropindex'], $misc->printVal($_REQUEST['index'])), "</p>\n";
 

diff --git a/operators.php b/operators.php
index 03af73677a7a59b1883531914bf224cfa51ed2ef..75300e269816d865b4618c11650df10ffee3ba58 100644 (file)
--- a/operators.php
+++ b/operators.php
@@ -3,7 +3,7 @@
        /**
         * Manage operators in a database
         *
-        * $Id: operators.php,v 1.16 2004/09/01 16:35:59 jollytoad Exp $
+        * $Id: operators.php,v 1.17 2004/09/07 13:58:21 jollytoad Exp $
         */
 
        // Include application functions
@@ -21,7 +21,7 @@
                global $PHP_SELF, $lang;
 
                $misc->printTrail('operator');
-               $misc->printTitle($lang['strproperties'],'operators');
+               $misc->printTitle($lang['strproperties'],'pg.operator');
                $misc->printMsg($msg);
                
                $oprdata = &$data->getOperator($_REQUEST['operator_oid']);
@@ -72,7 +72,7 @@
 
                if ($confirm) {
                        $misc->printTrail('operator');
-                       $misc->printTitle($lang['strdrop'], 'drop_operator');
+                       $misc->printTitle($lang['strdrop'], 'pg.operator.drop');
                        
                        echo "<p>", sprintf($lang['strconfdropoperator'], $misc->printVal($_REQUEST['operator'])), "</p>\n";    
                        

diff --git a/privileges.php b/privileges.php
index 6d91f054b7317aa3c08ccb2fae739ed1e8c39155..0d7a8a0d512efeb2d9092689a271b0d5c55f84ee 100644 (file)
--- a/privileges.php
+++ b/privileges.php
@@ -3,7 +3,7 @@
        /**
         * Manage privileges in a database
         *
-        * $Id: privileges.php,v 1.30 2004/09/01 16:35:59 jollytoad Exp $
+        * $Id: privileges.php,v 1.31 2004/09/07 13:58:21 jollytoad Exp $
         */
 
        // Include application functions
@@ -46,10 +46,14 @@
                        // Get groups from the database
                        $groups = &$data->getGroups();
 
-                       if ($mode == 'grant') $desc = $lang['strgrant'];
-                       else if ($mode == 'revoke') $desc = $lang['strrevoke'];
-                       
-                       $misc->printTitle($desc);
+                       switch ($mode) {
+                               case 'grant':
+                                       $misc->printTitle($lang['strgrant'],'pg.privilege.grant');
+                                       break;
+                               case 'revoke':
+                                       $misc->printTitle($lang['strrevoke'],'pg.privilege.revoke');
+                                       break;
+                       }
                        $misc->printMsg($msg);
                        
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
@@ -153,7 +157,7 @@
                                $misc->printTabs($_REQUEST['subject'], 'privileges');
                                break;
                        default:
-                               $misc->printTitle($lang['strprivileges']);
+                               $misc->printTitle($lang['strprivileges'], 'pg.privilege');
                }
                $misc->printMsg($msg);
 

diff --git a/rules.php b/rules.php
index 04130a52621302262abfc6f6755ab93647849250..f3d3fc10d151e7ba549f41f4bea90b59e360e747 100644 (file)
--- a/rules.php
+++ b/rules.php
@@ -3,7 +3,7 @@
        /**
         * List rules on a table OR view
         *
-        * $Id: rules.php,v 1.22 2004/09/01 16:35:59 jollytoad Exp $
+        * $Id: rules.php,v 1.23 2004/09/07 13:58:21 jollytoad Exp $
         */
 
        // Include application functions
@@ -27,7 +27,7 @@
 
                if ($confirm) {
                        $misc->printTrail($_REQUEST['subject']);
-                       $misc->printTitle($lang['strcreaterule']);
+                       $misc->printTitle($lang['strcreaterule'],'pg.rule.create');
                        $misc->printMsg($msg);
 
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
@@ -91,7 +91,7 @@
 
                if ($confirm) {
                        $misc->printTrail($_REQUEST['subject']);
-                       $misc->printTitle($lang['strdrop']);
+                       $misc->printTitle($lang['strdrop'].'pg.rule.drop');
 
                        echo "<p>", sprintf($lang['strconfdroprule'], $misc->printVal($_REQUEST['rule']),
                                $misc->printVal($_REQUEST[$_REQUEST['subject']])), "</p>\n";

diff --git a/sequences.php b/sequences.php
index 70b147f858998f726659853b7abf8feda2c4ad1a..ac4a8096d2c1ce0fba3194b8a01e60474e1f00e5 100644 (file)
--- a/sequences.php
+++ b/sequences.php
@@ -3,7 +3,7 @@
        /**
         * Manage sequences in a database
         *
-        * $Id: sequences.php,v 1.26 2004/09/01 16:35:59 jollytoad Exp $
+        * $Id: sequences.php,v 1.27 2004/09/07 13:58:21 jollytoad Exp $
         */
        
        // Include application functions
@@ -76,7 +76,7 @@
                global $lang;
                
                $misc->printTrail('sequence');
-               $misc->printTitle($lang['strproperties']);
+               $misc->printTitle($lang['strproperties'],'pg.sequence');
                $misc->printMsg($msg);
                
                // Fetch the sequence information
@@ -130,7 +130,7 @@
                
                if ($confirm) {
                        $misc->printTrail('sequence');
-                       $misc->printTitle($lang['strdrop']);
+                       $misc->printTitle($lang['strdrop'],'pg.sequence.drop');
                        $misc->printMsg($msg);
                        
                        echo "<p>", sprintf($lang['strconfdropsequence'], $misc->printVal($_REQUEST['sequence'])), "</p>\n";
@@ -171,7 +171,7 @@
                if (!isset($_POST['formCacheValue'])) $_POST['formCacheValue'] = '';
                
                $misc->printTrail('schema');
-               $misc->printTitle($lang['strcreatesequence']);
+               $misc->printTitle($lang['strcreatesequence'],'pg.sequence.create');
                $misc->printMsg($msg);
                
                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";

diff --git a/tables.php b/tables.php
index f073b2652f7078d8d02956c076c84e3d6b7d9505..b81c56cb9b5d206f3533c60524c98e758e746ad0 100644 (file)
--- a/tables.php
+++ b/tables.php
@@ -3,7 +3,7 @@
        /**
         * List tables in a database
         *
-        * $Id: tables.php,v 1.66 2004/09/02 13:53:56 jollytoad Exp $
+        * $Id: tables.php,v 1.67 2004/09/07 13:58:21 jollytoad Exp $
         */
 
        // Include application functions
@@ -31,7 +31,7 @@
                                if ($data->hasTablespaces()) $tablespaces = &$data->getTablespaces();
                                
                                $misc->printTrail('schema');
-                               $misc->printTitle($lang['strcreatetable'], 'create_table');
+                               $misc->printTitle($lang['strcreatetable'], 'pg.table.create');
                                $misc->printMsg($msg);
                                
                                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
@@ -96,7 +96,7 @@
                                $types = &$data->getTypes(true, false, true);
        
                                $misc->printTrail('schema');
-                               $misc->printTitle($lang['strcreatetable'], 'create_table');
+                               $misc->printTitle($lang['strcreatetable'], 'pg.table.create');
                                $misc->printMsg($msg);
 
                                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
@@ -218,7 +218,7 @@
 
                if ($confirm) {
                        $misc->printTrail('table');
-                       $misc->printTitle($lang['strselect'], 'select');
+                       $misc->printTitle($lang['strselect'], 'pg.sql.select');
                        $misc->printMsg($msg);
 
                        $attrs = &$data->getTableAttributes($_REQUEST['table']);
@@ -327,7 +327,7 @@
 
                if ($confirm) {
                        $misc->printTrail('table');
-                       $misc->printTitle($lang['strinsertrow'], 'insert');
+                       $misc->printTitle($lang['strinsertrow'], 'pg.sql.insert');
                        $misc->printMsg($msg);
 
                        $attrs = &$data->getTableAttributes($_REQUEST['table']);
@@ -420,7 +420,7 @@
 
                if ($confirm) {
                        $misc->printTrail('table');
-                       $misc->printTitle($lang['strempty']);
+                       $misc->printTitle($lang['strempty'],'pg.table.empty');
 
                        echo "<p>", sprintf($lang['strconfemptytable'], $misc->printVal($_REQUEST['table'])), "</p>\n";
 
@@ -451,7 +451,7 @@
 
                if ($confirm) {
                        $misc->printTrail('table');
-                       $misc->printTitle($lang['strdrop'], 'drop_table');
+                       $misc->printTitle($lang['strdrop'], 'pg.table.drop');
 
                        echo "<p>", sprintf($lang['strconfdroptable'], $misc->printVal($_REQUEST['table'])), "</p>\n";
 
@@ -490,7 +490,7 @@
 
                if ($confirm) {
                        $misc->printTrail('table');
-                       $misc->printTitle($lang['strvacuum'], 'vacuum');
+                       $misc->printTitle($lang['strvacuum'], 'pg.vacuum');
 
                        echo "<p>", sprintf($lang['strconfvacuumtable'], $misc->printVal($_REQUEST['table'])), "</p>\n";
 

diff --git a/tablespaces.php b/tablespaces.php
index ca4c1334e85547d959899ad2e04541629070242a..c31c3fbd4b03f3045162d10a668957664e8d10b6 100755 (executable)
--- a/tablespaces.php
+++ b/tablespaces.php
@@ -3,7 +3,7 @@
        /**
         * Manage tablespaces in a database cluster
         *
-        * $Id: tablespaces.php,v 1.5 2004/09/01 16:35:59 jollytoad Exp $
+        * $Id: tablespaces.php,v 1.6 2004/09/07 13:58:21 jollytoad Exp $
         */
 
        // Include application functions
@@ -21,7 +21,7 @@
                global $PHP_SELF, $lang;
                
                $misc->printTrail('tablespace');
-               $misc->printTitle($lang['stralter']);
+               $misc->printTitle($lang['stralter'],'pg.tablespace.alter');
                $misc->printMsg($msg);
 
                // Fetch tablespace info                
@@ -93,7 +93,7 @@
 
                if ($confirm) {
                        $misc->printTrail('tablespace');
-                       $misc->printTitle($lang['strdrop']);
+                       $misc->printTitle($lang['strdrop'],'pg.tablespace.drop');
                        
                        echo "<p>", sprintf($lang['strconfdroptablespace'], $misc->printVal($_REQUEST['tablespace'])), "</p>\n";        
                        
@@ -128,7 +128,7 @@
                $users = &$data->getUsers();
                
                $misc->printTrail('server');
-               $misc->printTitle($lang['strcreatetablespace']);
+               $misc->printTitle($lang['strcreatetablespace'],'pg.tablespace.create');
                $misc->printMsg($msg);
 
                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";

diff --git a/tblproperties.php b/tblproperties.php
index d79e6c7e60ae881de801459bdef945656fd9b358..d89d42ec00f897c98833356a02cc0dd95fb334af 100644 (file)
--- a/tblproperties.php
+++ b/tblproperties.php
@@ -3,7 +3,7 @@
        /**
         * List tables in a database
         *
-        * $Id: tblproperties.php,v 1.60 2004/09/02 13:53:57 jollytoad Exp $
+        * $Id: tblproperties.php,v 1.61 2004/09/07 13:58:21 jollytoad Exp $
         */
 
        // Include application functions
@@ -47,7 +47,7 @@
                global $PHP_SELF, $lang;
                
                $misc->printTrail('table');
-               $misc->printTitle($lang['stralter'], 'alter_table');
+               $misc->printTitle($lang['stralter'], 'pg.table.alter');
                $misc->printMsg($msg);
 
                // Fetch table info             
@@ -234,7 +234,7 @@
                                $types = &$data->getTypes(true, false, true);
 
                                $misc->printTrail('table');
-                               $misc->printTitle($lang['straddcolumn'], 'add_column');
+                               $misc->printTitle($lang['straddcolumn'], 'pg.column.add');
                                $misc->printMsg($msg);
 
                                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
@@ -331,7 +331,7 @@
                                global $lang;
 
                                $misc->printTrail('column');
-                               $misc->printTitle($lang['straltercolumn'], 'alter_column'); 
+                               $misc->printTitle($lang['straltercolumn'], 'pg.column.alter'); 
                                $misc->printMsg($msg);
 
                                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
@@ -478,7 +478,7 @@
 
                if ($confirm) {
                        $misc->printTrail('column');
-                       $misc->printTitle($lang['strdrop'], 'drop_column');
+                       $misc->printTitle($lang['strdrop'], 'pg.column.drop');
 
             echo "<p>", sprintf($lang['strconfdropcolumn'], $misc->printVal($_REQUEST['column']),
                     $misc->printVal($_REQUEST['table'])), "</p>\n";

diff --git a/triggers.php b/triggers.php
index 228e3f7f11145ce383544bbdf68349ba8c286aad..977b23bc4f9c8eeef434c67c5736a5a8bd56b7c4 100644 (file)
--- a/triggers.php
+++ b/triggers.php
@@ -3,7 +3,7 @@
        /**
         * List triggers on a table
         *
-        * $Id: triggers.php,v 1.22 2004/09/01 16:35:59 jollytoad Exp $
+        * $Id: triggers.php,v 1.23 2004/09/07 13:58:21 jollytoad Exp $
         */
 
        // Include application functions
@@ -34,7 +34,7 @@
                global $PHP_SELF, $lang;
                
                $misc->printTrail('trigger');
-               $misc->printTitle($lang['stralter']);
+               $misc->printTitle($lang['stralter'],'pg.trigger.alter');
                $misc->printMsg($msg);
                
                $triggerdata = &$data->getTrigger($_REQUEST['table'], $_REQUEST['trigger']);
@@ -70,7 +70,7 @@
 
                if ($confirm) {
                        $misc->printTrail('trigger');
-                       $misc->printTitle($lang['strdrop']);
+                       $misc->printTitle($lang['strdrop'].'pg.trigger.drop');
 
                        echo "<p>", sprintf($lang['strconfdroptrigger'], $misc->printVal($_REQUEST['trigger']),
                                $misc->printVal($_REQUEST['table'])), "</p>\n";
@@ -106,7 +106,7 @@
                global $PHP_SELF, $lang;
                
                $misc->printTrail('table');
-               $misc->printTitle($lang['strcreatetrigger']);
+               $misc->printTitle($lang['strcreatetrigger'],'pg.trigger.create');
                $misc->printMsg($msg);
                
                // Get all the functions that can be used in triggers

diff --git a/types.php b/types.php
index 28af90b1e16a75c5d571239d1f7d2718faa349c7..eb1bb6676a1ed486e94bd22ba57d1cfd8e590e04 100644 (file)
--- a/types.php
+++ b/types.php
@@ -3,7 +3,7 @@
        /**
         * Manage types in a database
         *
-        * $Id: types.php,v 1.24 2004/09/01 16:35:59 jollytoad Exp $
+        * $Id: types.php,v 1.25 2004/09/07 13:58:21 jollytoad Exp $
         */
 
        // Include application functions
@@ -24,7 +24,7 @@
                $typedata = &$data->getType($_REQUEST['type']);
 
                $misc->printTrail('type');
-               $misc->printTitle($lang['strproperties'], 'types');
+               $misc->printTitle($lang['strproperties'], 'pg.type');
                $misc->printMsg($msg);
                
                if ($typedata->recordCount() > 0) {
@@ -90,7 +90,7 @@
 
                if ($confirm) {
                        $misc->printTrail('type');
-                       $misc->printTitle($lang['strdrop'], 'drop_type');
+                       $misc->printTitle($lang['strdrop'], 'pg.type.drop');
 
                        echo "<p>", sprintf($lang['strconfdroptype'], $misc->printVal($_REQUEST['type'])), "</p>\n";
 
@@ -131,7 +131,7 @@
                switch ($_REQUEST['stage']) {
                        case 1:
                                $misc->printTrail('type');
-                               $misc->printTitle($lang['strcreatecomptype'], 'create_type');
+                               $misc->printTitle($lang['strcreatecomptype'], 'pg.type.create');
                                $misc->printMsg($msg);
                                
                                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
@@ -174,7 +174,7 @@
                                $types = &$data->getTypes(true, false, true);
 
                                $misc->printTrail('type');
-                               $misc->printTitle($lang['strcreatecomptype'], 'create_type');
+                               $misc->printTitle($lang['strcreatecomptype'], 'pg.type.create');
                                $misc->printMsg($msg);
 
                                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
@@ -286,7 +286,7 @@
                $types = &$data->getTypes(true);
 
                $misc->printTrail('schema');
-               $misc->printTitle($lang['strcreatetype'], 'create_type');
+               $misc->printTitle($lang['strcreatetype'], 'pg.type.create');
                $misc->printMsg($msg);
 
                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";

diff --git a/users.php b/users.php
index 558c159110385af5a3a5a5227a328df7dbcc15af..dea93ce51dc41ce39beba7152e10335142120b4a 100644 (file)
--- a/users.php
+++ b/users.php
@@ -3,7 +3,7 @@
        /**
         * Manage users in a database cluster
         *
-        * $Id: users.php,v 1.28 2004/09/02 13:41:56 jollytoad Exp $
+        * $Id: users.php,v 1.29 2004/09/07 13:58:21 jollytoad Exp $
         */
 
        // Include application functions
@@ -27,7 +27,7 @@
                $_REQUEST['user'] = $_SESSION['webdbUsername'];
                
                $misc->printTrail('user');
-               $misc->printTitle($lang['straccount']);
+               $misc->printTitle($lang['straccount'],'pg.user');
                $misc->printMsg($msg);
 
                if ($userdata->recordCount() > 0) {
@@ -59,7 +59,7 @@
                if ($confirm) {
                        $_REQUEST['user'] = $_SESSION['webdbUsername'];
                        $misc->printTrail('user');
-                       $misc->printTitle($lang['strchangepassword']);
+                       $misc->printTitle($lang['strchangepassword'],'pg.user.alter');
                        $misc->printMsg($msg);
                        
                        if (!isset($_POST['password'])) $_POST['password'] = '';
@@ -104,7 +104,7 @@
                global $PHP_SELF, $lang;
        
                $misc->printTrail('user');
-               $misc->printTitle($lang['stralter']);
+               $misc->printTitle($lang['stralter'],'pg.user.alter');
                $misc->printMsg($msg);
                
                $userdata = &$data->getUser($_REQUEST['username']);
@@ -178,7 +178,7 @@
 
                if ($confirm) {
                        $misc->printTrail('user');
-                       $misc->printTitle($lang['strdrop']);
+                       $misc->printTitle($lang['strdrop'],'pg.user.drop');
                        
                        echo "<p>", sprintf($lang['strconfdropuser'], $misc->printVal($_REQUEST['username'])), "</p>\n";        
                        
@@ -211,7 +211,7 @@
                if (!isset($_POST['formExpires'])) $_POST['formExpires'] = '';
                
                $misc->printTrail('server');
-               $misc->printTitle($lang['strcreateuser']);
+               $misc->printTitle($lang['strcreateuser'],'pg.user.create');
                $misc->printMsg($msg);
 
                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";

diff --git a/viewproperties.php b/viewproperties.php
index f45e979ba6a3738d1801738b9ce40df0ca61cfb0..cb52ba944d7ff9218b45f1aa3cb09b617af8b127 100755 (executable)
--- a/viewproperties.php
+++ b/viewproperties.php
@@ -3,7 +3,7 @@
        /**
         * List views in a database
         *
-        * $Id: viewproperties.php,v 1.12 2004/09/02 13:53:57 jollytoad Exp $
+        * $Id: viewproperties.php,v 1.13 2004/09/07 13:58:21 jollytoad Exp $
         */
 
        // Include application functions
@@ -33,7 +33,7 @@
                global $PHP_SELF, $lang;
                
                $misc->printTrail('view');
-               $misc->printTitle($lang['stredit']);
+               $misc->printTitle($lang['stredit'],'pg.view.alter');
                $misc->printMsg($msg);
                
                $viewdata = &$data->getView($_REQUEST['view']);
@@ -168,7 +168,7 @@
                                global $lang;
 
                                $misc->printTrail('column');
-                               $misc->printTitle($lang['straltercolumn']); 
+                               $misc->printTitle($lang['straltercolumn'],'pg.column.alter'); 
                                $misc->printMsg($msg);
 
                                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";

diff --git a/views.php b/views.php
index 25763f04028ff29191d3f8fdf6dde6cadd1b7fcf..ec057e03f0b3e6385e5a351a250d837e77a1edac 100644 (file)
--- a/views.php
+++ b/views.php
@@ -3,7 +3,7 @@
        /**
         * Manage views in a database
         *
-        * $Id: views.php,v 1.50 2004/09/02 13:53:57 jollytoad Exp $
+        * $Id: views.php,v 1.51 2004/09/07 13:58:21 jollytoad Exp $
         */
 
        // Include application functions
@@ -24,7 +24,7 @@
 
                if ($confirm) {
                        $misc->printTrail('view');
-                       $misc->printTitle($lang['strselect'], 'select');
+                       $misc->printTitle($lang['strselect'], 'pg.sql.select');
                        $misc->printMsg($msg);
 
                        $attrs = &$data->getTableAttributes($_REQUEST['view']);
@@ -132,7 +132,7 @@
 
                if ($confirm) { 
                        $misc->printTrail('view');
-                       $misc->printTitle($lang['strdrop'],'drop_view');
+                       $misc->printTitle($lang['strdrop'],'pg.view.drop');
                        
                        echo "<p>", sprintf($lang['strconfdropview'], $misc->printVal($_REQUEST['view'])), "</p>\n";
                        
@@ -175,7 +175,7 @@
                        if (!isset($_REQUEST['formComment'])) $_REQUEST['formComment'] = '';
                        
                        $misc->printTrail('schema');
-                       $misc->printTitle($lang['strcreateviewwiz'], 'create_view');
+                       $misc->printTitle($lang['strcreateviewwiz'], 'pg.view.create');
                        $misc->printMsg($msg);
                        
                        $tblCount = sizeof($_POST['formTables']);
@@ -311,7 +311,7 @@
                $tables = &$data->getTables(true);
                
                $misc->printTrail('schema');
-               $misc->printTitle($lang['strcreateviewwiz'], 'create_view');
+               $misc->printTitle($lang['strcreateviewwiz'], 'pg.view.create');
                $misc->printMsg($msg);
                
                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
@@ -355,7 +355,7 @@
                if (!isset($_REQUEST['formComment'])) $_REQUEST['formComment'] = '';
                
                $misc->printTrail('schema');
-               $misc->printTitle($lang['strcreateview'], 'create_view');
+               $misc->printTitle($lang['strcreateview'], 'pg.view.create');
                $misc->printMsg($msg);
                
                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";