explicit pages in urls instead of a buggy "?..." with redirect.php

diff --git a/aggregates.php b/aggregates.php
index 26df99a6c4c864af67dd2fc7b7fed8ef06b1b38d..ddc3b1d6f3755d63fd9f105aef425d25feb9586d 100644 (file)
--- a/aggregates.php
+++ b/aggregates.php
@@ -3,7 +3,7 @@
        /**
         * Manage aggregates in a database
         *
-        * $Id: aggregates.php,v 1.22 2007/07/12 19:26:22 xzilla Exp $
+        * $Id: aggregates.php,v 1.23 2007/07/16 21:27:28 ioguix Exp $
         */
 
        // Include application functions
@@ -246,12 +246,12 @@
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
 
-               echo "<p><a class=\"navlink\" href=\"?{$misc->href}\">{$lang['straggrshowall']}</a> |\n";
+               echo "<p><a class=\"navlink\" href=\"aggregates.php?{$misc->href}\">{$lang['straggrshowall']}</a> |\n";
                if ($data->hasAlterAggregate()) {
-               echo "<a class=\"navlink\" href=\"?action=alter&amp;{$misc->href}&amp;aggrname=", 
+               echo "<a class=\"navlink\" href=\"aggregates.php?action=alter&amp;{$misc->href}&amp;aggrname=", 
                        urlencode($_REQUEST['aggrname']), "&amp;aggrtype=", urlencode($_REQUEST['aggrtype']), "\">{$lang['stralter']}</a> |\n";
                }
-               echo "<a class=\"navlink\" href=\"?action=confirm_drop&amp;{$misc->href}&amp;aggrname=",
+               echo "<a class=\"navlink\" href=\"aggregates.php?action=confirm_drop&amp;{$misc->href}&amp;aggrname=",
                        urlencode($_REQUEST['aggrname']), "&amp;aggrtype=", urlencode($_REQUEST['aggrtype']), "\">{$lang['strdrop']}</a></p>\n";
        }
 
@@ -300,12 +300,12 @@
                $actions = array(
                        'alter' => array(
                                'title' => $lang['stralter'],
-                               'url'   => "?action=alter&amp;{$misc->href}&amp;",
+                               'url'   => "aggregates.php?action=alter&amp;{$misc->href}&amp;",
                                'vars'  => array('aggrname' => 'proname', 'aggrtype' => 'proargtypes'),
                        ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "?action=confirm_drop&amp;{$misc->href}&amp;",
+                               'url'   => "aggregates.php?action=confirm_drop&amp;{$misc->href}&amp;",
                                'vars'  => array('aggrname' => 'proname', 'aggrtype' => 'proargtypes'),
                        )
                );
@@ -313,7 +313,7 @@
                if (!$data->hasAlterAggregate()) unset($actions['alter']);
                $misc->printTable($aggregates, $columns, $actions, $lang['strnoaggregates']);
                
-               echo "<p><a class=\"navlink\" href=\"?action=create&amp;{$misc->href}\">{$lang['strcreateaggregate']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"aggregates.php?action=create&amp;{$misc->href}\">{$lang['strcreateaggregate']}</a></p>\n";
        }
 
        /**

diff --git a/all_db.php b/all_db.php
index 4c50ea4418bee53ce13cb2bd01d406caa2da8b07..868a044ce7c907880736635cfc129f412e371d6c 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.54 2007/07/12 19:26:22 xzilla Exp $
+        * $Id: all_db.php,v 1.55 2007/07/16 21:27:28 ioguix Exp $
         */
 
        // Include application functions
@@ -353,7 +353,7 @@
                $actions = array(
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "?action=confirm_drop&subject=database&{$misc->href}&",
+                               'url'   => "all_db.php?action=confirm_drop&subject=database&{$misc->href}&",
                                'vars'  => array('dropdatabase' => 'datname'),
                        ),
                        'privileges' => array(
@@ -365,7 +365,7 @@
                if ($data->hasAlterDatabase() ) {
                        $actions['alter'] = array(
                                'title' => $lang['stralter'],
-                               'url'   => "?action=confirm_alter&subject=database&{$misc->href}&",
+                               'url'   => "all_db.php?action=confirm_alter&subject=database&{$misc->href}&",
                                'vars'  => array('alterdatabase' => 'datname')
                        );
                }
@@ -376,7 +376,7 @@
                
                $misc->printTable($databases, $columns, $actions, $lang['strnodatabases'], null, $multiactions);
 
-               echo "<p><a class=\"navlink\" href=\"?action=create&amp;{$misc->href}\">{$lang['strcreatedatabase']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"all_db.php?action=create&amp;{$misc->href}\">{$lang['strcreatedatabase']}</a></p>\n";
 
        }
        

diff --git a/colproperties.php b/colproperties.php
index 91034c5385b82020ee22d6b4f936951c860dbd80..80982775ee22dee2d31e1c252825284801fd52e2 100644 (file)
--- a/colproperties.php
+++ b/colproperties.php
@@ -247,7 +247,7 @@
                                        urlencode("SELECT \"{$_REQUEST['column']}\", count(*) AS \"count\" FROM \"$tableName\" GROUP BY \"{$_REQUEST['column']}\" ORDER BY \"{$_REQUEST['column']}\"") , "\">{$lang['strbrowse']}</a></li>\n";
 
                                /* Edit link */
-                               echo "\t<li><a href=\"?action=properties&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),
+                               echo "\t<li><a href=\"colproperties.php?action=properties&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),
                                    "&amp;column=", urlencode($_REQUEST['column']) . "\">{$lang['stralter']}</a></li>\n";
                                
                                /* Delete link */

diff --git a/constraints.php b/constraints.php
index 9ae7ab18b27481405d9e27a49b3df923f10c3e0b..1496a4348b3bf260474d561c0752a1a6ea75a96a 100644 (file)
--- a/constraints.php
+++ b/constraints.php
@@ -3,7 +3,7 @@
        /**
         * List constraints on a table
         *
-        * $Id: constraints.php,v 1.50 2007/07/16 08:45:00 ioguix Exp $
+        * $Id: constraints.php,v 1.51 2007/07/16 21:27:28 ioguix Exp $
         */
 
        // Include application functions
@@ -467,7 +467,7 @@
                $actions = array(
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "?action=confirm_drop&{$misc->href}&table=".urlencode($_REQUEST['table'])."&",
+                               'url'   => "constraints.php?action=confirm_drop&{$misc->href}&table=".urlencode($_REQUEST['table'])."&",
                                'vars'  => array('constraint' => 'conname', 'type' => 'contype'),
                        ),
                );

diff --git a/database.php b/database.php
index d0c3cd9904fdc5868b848beb4d92ff883cbb9eda..bc0dbbc014594cf91b3d2b250adcbb6cbf3338cd 100755 (executable)
--- a/database.php
+++ b/database.php
@@ -3,7 +3,7 @@
        /**
         * Manage schemas within a database
         *
-        * $Id: database.php,v 1.99 2007/07/12 19:26:22 xzilla Exp $
+        * $Id: database.php,v 1.100 2007/07/16 21:27:28 ioguix Exp $
         */
 
        // Include application functions
@@ -475,7 +475,7 @@
                        $actions = array(
                                'cancel' => array(
                                        'title' => $lang['strcancel'],
-                                       'url'   => "?action=signal&signal=CANCEL&{$misc->href}&",
+                                       'url'   => "database.php?action=signal&signal=CANCEL&{$misc->href}&",
                                        'vars'  => array('procpid' => 'procpid')
                                )
                        );
@@ -688,12 +688,12 @@
                                        $actions = array(
                                                'edit' => array(
                                                'title' => $lang['stredit'],
-                                               'url'   => "?action=editautovac&schema=pg_catalog&{$misc->href}&",
+                                               'url'   => "database.php?action=editautovac&schema=pg_catalog&{$misc->href}&",
                                                'vars'  => array('key[vacrelid]' => 'vacrelid')
                                                ),
                                                'delete' => array(
                                                'title' => $lang['strdelete'],
-                                               'url'   => "?action=delautovac&{$misc->href}&",
+                                               'url'   => "database.php?action=delautovac&{$misc->href}&",
                                                'vars'  => array('key[vacrelid]' => 'vacrelid')
                                                )
                                        );

diff --git a/domains.php b/domains.php
index d0f900ac23c8a22e991699988cfcf24139164e92..6a4ab9be0b8bbffed46a413b1c6f4eeddf643803 100644 (file)
--- a/domains.php
+++ b/domains.php
@@ -3,7 +3,7 @@
        /**
         * Manage domains in a database
         *
-        * $Id: domains.php,v 1.31 2007/07/12 19:26:22 xzilla Exp $
+        * $Id: domains.php,v 1.32 2007/07/16 21:27:29 ioguix Exp $
         */
 
        // Include application functions
@@ -218,7 +218,7 @@
                                                echo $misc->printVal($domaincons->fields['consrc']);
                                                echo "</td>";
                                                echo "<td class=\"opbutton{$id}\">";
-                                               echo "<a href=\"?action=confirm_drop_con&amp;{$misc->href}&amp;constraint=", urlencode($domaincons->fields['conname']),
+                                               echo "<a href=\"domains.php?action=confirm_drop_con&amp;{$misc->href}&amp;constraint=", urlencode($domaincons->fields['conname']),
                                                        "&amp;domain=", urlencode($_REQUEST['domain']), "&amp;type=", urlencode($domaincons->fields['contype']), "\">{$lang['strdrop']}</a></td></tr>\n";
                
                                                $domaincons->moveNext();
@@ -231,11 +231,11 @@
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
                
-               echo "<p><a class=\"navlink\" href=\"?{$misc->href}\">{$lang['strshowalldomains']}</a>\n";
+               echo "<p><a class=\"navlink\" href=\"domains.php?{$misc->href}\">{$lang['strshowalldomains']}</a>\n";
                if ($data->hasDomainConstraints()) {
-                       echo "| <a class=\"navlink\" href=\"?action=add_check&amp;{$misc->href}&amp;domain=", urlencode($_REQUEST['domain']),
+                       echo "| <a class=\"navlink\" href=\"domains.php?action=add_check&amp;{$misc->href}&amp;domain=", urlencode($_REQUEST['domain']),
                                "\">{$lang['straddcheck']}</a>\n";
-                       echo "| <a class=\"navlink\" href=\"?action=alter&amp;{$misc->href}&amp;domain=", 
+                       echo "| <a class=\"navlink\" href=\"domains.php?action=alter&amp;{$misc->href}&amp;domain=", 
                                urlencode($_REQUEST['domain']), "\">{$lang['stralter']}</a>\n";
                }
                echo "</p>\n";
@@ -377,7 +377,7 @@
                        'domain' => array(
                                'title' => $lang['strdomain'],
                                'field' => 'domname',
-                               'url' => "?action=properties&amp;{$misc->href}&amp;",
+                               'url' => "domains.php?action=properties&amp;{$misc->href}&amp;",
                                'vars'  => array('domain' => 'domname'),
                        ),
                        'type' => array(
@@ -410,19 +410,19 @@
                $actions = array(
                        'alter' => array(
                                'title' => $lang['stralter'],
-                               'url'   => "?action=alter&amp;{$misc->href}&amp;",
+                               'url'   => "domains.php?action=alter&amp;{$misc->href}&amp;",
                                'vars'  => array('domain' => 'domname'),
                        ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "?action=confirm_drop&amp;{$misc->href}&amp;",
+                               'url'   => "domains.php?action=confirm_drop&amp;{$misc->href}&amp;",
                                'vars'  => array('domain' => 'domname'),
                        ),
                );
                
                $misc->printTable($domains, $columns, $actions, $lang['strnodomains']);
                
-               echo "<p><a class=\"navlink\" href=\"?action=create&amp;{$misc->href}\">{$lang['strcreatedomain']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"domains.php?action=create&amp;{$misc->href}\">{$lang['strcreatedomain']}</a></p>\n";
 
        }
        

diff --git a/functions.php b/functions.php
index 48c6b417a6d74d3ee50206f70c99b50f54fcb89c..5a66285cb0cac79ea4b214186ed9aa1129096340 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -3,7 +3,7 @@
        /**
         * Manage functions in a database
         *
-        * $Id: functions.php,v 1.65 2007/07/12 19:26:22 xzilla Exp $
+        * $Id: functions.php,v 1.66 2007/07/16 21:27:29 ioguix Exp $
         */
 
        // Include application functions
@@ -256,10 +256,10 @@
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
                
-               echo "<p><a class=\"navlink\" href=\"?{$misc->href}\">{$lang['strshowallfunctions']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"?action=edit&amp;{$misc->href}&amp;function=", 
+               echo "<p><a class=\"navlink\" href=\"functions.php?{$misc->href}\">{$lang['strshowallfunctions']}</a> |\n";
+               echo "<a class=\"navlink\" href=\"functions.php?action=edit&amp;{$misc->href}&amp;function=", 
                        urlencode($_REQUEST['function']), "&amp;function_oid=", urlencode($_REQUEST['function_oid']), "\">{$lang['stralter']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"?action=confirm_drop&amp;{$misc->href}&amp;function=",
+               echo "<a class=\"navlink\" href=\"functions.php?action=confirm_drop&amp;{$misc->href}&amp;function=",
                        urlencode($func_full), "&amp;function_oid=", $_REQUEST['function_oid'], "\">{$lang['strdrop']}</a>\n";
        }
        
@@ -659,12 +659,12 @@
                $actions = array(
                        'alter' => array(
                                'title' => $lang['stralter'],
-                               'url'   => "?action=edit&amp;{$misc->href}&amp;",
+                               'url'   => "functions.php?action=edit&amp;{$misc->href}&amp;",
                                'vars'  => array('function' => 'proproto', 'function_oid' => 'prooid'),
                        ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "?action=confirm_drop&amp;{$misc->href}&amp;",
+                               'url'   => "functions.php?action=confirm_drop&amp;{$misc->href}&amp;",
                                'vars'  => array('function' => 'proproto', 'function_oid' => 'prooid'),
                        ),
                        'privileges' => array(
@@ -680,9 +680,9 @@
                
                $misc->printTable($funcs, $columns, $actions, $lang['strnofunctions']);
 
-               echo "<p><a class=\"navlink\" href=\"?action=create&amp;{$misc->href}\">{$lang['strcreateplfunction']}</a> | ";
-               echo "<a class=\"navlink\" href=\"?action=create&amp;language=internal&amp;{$misc->href}\">{$lang['strcreateinternalfunction']}</a> | ";
-               echo "<a class=\"navlink\" href=\"?action=create&amp;language=C&amp;{$misc->href}\">{$lang['strcreatecfunction']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"functions.php?action=create&amp;{$misc->href}\">{$lang['strcreateplfunction']}</a> | ";
+               echo "<a class=\"navlink\" href=\"functions.php?action=create&amp;language=internal&amp;{$misc->href}\">{$lang['strcreateinternalfunction']}</a> | ";
+               echo "<a class=\"navlink\" href=\"functions.php?action=create&amp;language=C&amp;{$misc->href}\">{$lang['strcreatecfunction']}</a></p>\n";
        }
        
        /**

diff --git a/groups.php b/groups.php
index 929569e24d6e1308d6c7a22797a4715f5dd49193..6bb2af1a8465578f18c8e12b1caedd31f8379c27 100644 (file)
--- a/groups.php
+++ b/groups.php
@@ -3,7 +3,7 @@
        /**
         * Manage groups in a database cluster
         *
-        * $Id: groups.php,v 1.25 2007/07/12 19:26:22 xzilla Exp $
+        * $Id: groups.php,v 1.26 2007/07/16 21:27:29 ioguix Exp $
         */
 
        // Include application functions
@@ -80,7 +80,7 @@
                while (!$groupdata->EOF) {
                                        $id = (($i % 2) == 0 ? '1' : '2');
                echo "<tr><td class=\"data{$id}\">", $misc->printVal($groupdata->fields['usename']), "</td>\n";
-                                       echo "<td class=\"opbutton{$id}\"><a href=\"?action=confirm_drop_member&{$misc->href}&group=",
+                                       echo "<td class=\"opbutton{$id}\"><a href=\"groups.php?action=confirm_drop_member&{$misc->href}&group=",
                                                urlencode($_REQUEST['group']), "&user=", urlencode($groupdata->fields['usename']), "\">{$lang['strdrop']}</a></td>\n";
                echo "</tr>\n";
                $groupdata->moveNext();
@@ -105,7 +105,7 @@
                echo "<input type=\"hidden\" name=\"action\" value=\"add_member\" />\n";
                echo "</form>\n";
                
-               echo "<p><a class=\"navlink\" href=\"?{$misc->href}\">{$lang['strshowallgroups']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"groups.php?{$misc->href}\">{$lang['strshowallgroups']}</a></p>\n";
        }
        
        /**
@@ -219,7 +219,7 @@
                        'group' => array(
                                'title' => $lang['strgroup'],
                                'field' => 'groname',
-                               'url'   => "?action=properties&amp;{$misc->href}&amp;",
+                               'url'   => "groups.php?action=properties&amp;{$misc->href}&amp;",
                                'vars'  => array('group' => 'groname'),
                        ),
                        'actions' => array(
@@ -230,14 +230,14 @@
                $actions = array(
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "?action=confirm_drop&amp;{$misc->href}&amp;",
+                               'url'   => "groups.php?action=confirm_drop&amp;{$misc->href}&amp;",
                                'vars'  => array('group' => 'groname'),
                        ),
                );
                
                $misc->printTable($groups, $columns, $actions, $lang['strnogroups']);
                
-               echo "<p><a class=\"navlink\" href=\"?action=create&amp;{$misc->href}\">{$lang['strcreategroup']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"groups.php?action=create&amp;{$misc->href}\">{$lang['strcreategroup']}</a></p>\n";
 
        }
 

diff --git a/indexes.php b/indexes.php
index ae00bcf5e37cc401cc47b87204d0e6aff3a82c44..8bdd4d509d5a99c1c04eaf08969a125f02bdc93e 100644 (file)
--- a/indexes.php
+++ b/indexes.php
@@ -3,7 +3,7 @@
        /**
         * List indexes on a table
         *
-        * $Id: indexes.php,v 1.42 2007/07/12 19:26:22 xzilla Exp $
+        * $Id: indexes.php,v 1.43 2007/07/16 21:27:29 ioguix Exp $
         */
 
        // Include application functions
@@ -288,17 +288,17 @@
                $actions = array(
                        'cluster' => array(
                                'title' => $lang['strclusterindex'],
-                               'url'   => "?action=confirm_cluster_index&{$misc->href}&table=".urlencode($_REQUEST['table'])."&",
+                               'url'   => "indexes.php?action=confirm_cluster_index&{$misc->href}&table=".urlencode($_REQUEST['table'])."&",
                                'vars'  => array('index' => 'indname'),
                        ),
                        'reindex' => array(
                                'title' => $lang['strreindex'],
-                               'url'   => "?action=reindex&{$misc->href}&table=".urlencode($_REQUEST['table'])."&",
+                               'url'   => "indexes.php?action=reindex&{$misc->href}&table=".urlencode($_REQUEST['table'])."&",
                                'vars'  => array('index' => 'indname'),
                        ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "?action=confirm_drop_index&{$misc->href}&table=".urlencode($_REQUEST['table'])."&",
+                               'url'   => "indexes.php?action=confirm_drop_index&{$misc->href}&table=".urlencode($_REQUEST['table'])."&",
                                'vars'  => array('index' => 'indname'),
                        ),
                );
@@ -307,7 +307,8 @@
                
                $misc->printTable($indexes, $columns, $actions, $lang['strnoindexes'], 'indPre');
                
-               echo "<p><a class=\"navlink\" href=\"?action=create_index&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']), "\">{$lang['strcreateindex']}</a></p>\n";               
+               echo "<p><a class=\"navlink\" href=\"indexes.php?action=create_index&amp;{$misc->href}&amp;table=", 
+                       urlencode($_REQUEST['table']), "\">{$lang['strcreateindex']}</a></p>\n";                
        }
 
        function doTree() {

diff --git a/operators.php b/operators.php
index 61b1864e3be37464eb92d1547e1395458e37e5b8..0953cf2119040b55f9caebbaed7ff1db0aeec31c 100644 (file)
--- a/operators.php
+++ b/operators.php
@@ -3,7 +3,7 @@
        /**
         * Manage operators in a database
         *
-        * $Id: operators.php,v 1.27 2007/07/12 19:26:22 xzilla Exp $
+        * $Id: operators.php,v 1.28 2007/07/16 21:27:29 ioguix Exp $
         */
 
        // Include application functions
@@ -56,7 +56,7 @@
                        echo "<td class=\"data1\">", $misc->printVal($oprdata->fields['oprgtcmpop']), "</td></tr>\n";
                        echo "</table>\n";
 
-                       echo "<p><a class=\"navlink\" href=\"?{$misc->href}\">{$lang['strshowalloperators']}</a></p>\n";
+                       echo "<p><a class=\"navlink\" href=\"operators.php?{$misc->href}\">{$lang['strshowalloperators']}</a></p>\n";
                }
                else
                        doDefault($lang['strinvalidparam']);
@@ -115,7 +115,7 @@
                        'operator' => array(
                                'title' => $lang['stroperator'],
                                'field' => 'oprname',
-                               'url'   => "?action=properties&amp;{$misc->href}&amp;",
+                               'url'   => "operators.php?action=properties&amp;{$misc->href}&amp;",
                                'vars'  => array('operator' => 'oprname', 'operator_oid' => 'oid'),
                        ),
                        'leftarg' => array(
@@ -142,14 +142,14 @@
                $actions = array(
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "?action=confirm_drop&amp;{$misc->href}&amp;",
+                               'url'   => "operators.php?action=confirm_drop&amp;{$misc->href}&amp;",
                                'vars'  => array('operator' => 'oprname', 'operator_oid' => 'oid'),
                        ),
                );
                
                $misc->printTable($operators, $columns, $actions, $lang['strnooperators']);
                
-//             echo "<p><a class=\"navlink\" href=\"?action=create&amp;{$misc->href}\">{$lang['strcreateoperator']}</a></p>\n";
+//             echo "<p><a class=\"navlink\" href=\"operators.php?action=create&amp;{$misc->href}\">{$lang['strcreateoperator']}</a></p>\n";
        }
 
        /**

diff --git a/plugin_slony.php b/plugin_slony.php
index 3287272b59b98e3365efae944f2db233fa2d5e1c..707b279695f2e23bd93522acb0548078f84a7987 100755 (executable)
--- a/plugin_slony.php
+++ b/plugin_slony.php
@@ -3,7 +3,7 @@
        /**
         * Slony database tab plugin
         *
-        * $Id: plugin_slony.php,v 1.21 2007/07/15 09:37:34 ioguix Exp $
+        * $Id: plugin_slony.php,v 1.22 2007/07/16 21:27:29 ioguix Exp $
         */
 
        // Include application functions
@@ -457,7 +457,7 @@
                $misc->printTable($clusters, $columns, $actions, $lang['strnoclusters']);
 
                if ($clusters->recordCount() == 0) {            
-                       echo "<p><a class=\"navlink\" href=\"?action=create_cluster&amp;{$misc->href}\">{$lang['strinitcluster']}</a></p>\n";
+                       echo "<p><a class=\"navlink\" href=\"plugin_slony.php?action=create_cluster&amp;{$misc->href}\">{$lang['strinitcluster']}</a></p>\n";
                }
        }
 
@@ -625,7 +625,7 @@
                
                $misc->printTable($nodes, $columns, $actions, $lang['strnonodes']);
                
-               echo "<p><a class=\"navlink\" href=\"?action=create_node&amp;{$misc->href}\">{$lang['strcreatenode']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"plugin_slony.php?action=create_node&amp;{$misc->href}\">{$lang['strcreatenode']}</a></p>\n";
        }
        
        /**
@@ -660,7 +660,7 @@
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
 
-               echo "<p><a class=\"navlink\" href=\"?action=confirm_drop_node&amp;{$misc->href}&amp;no_id={$_REQUEST['no_id']}\">{$lang['strdrop']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"plugin_slony.php?action=confirm_drop_node&amp;{$misc->href}&amp;no_id={$_REQUEST['no_id']}\">{$lang['strdrop']}</a></p>\n";
        }
 
        /**
@@ -776,7 +776,7 @@
                
                $misc->printTable($paths, $columns, $actions, $lang['strnopaths']);
        
-               echo "<p><a class=\"navlink\" href=\"?action=create_path&amp;{$misc->href}&amp;no_id={$_REQUEST['no_id']}\">{$lang['strcreatepath']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"plugin_slony.php?action=create_path&amp;{$misc->href}&amp;no_id={$_REQUEST['no_id']}\">{$lang['strcreatepath']}</a></p>\n";
        }
        
        /**
@@ -811,7 +811,7 @@
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
 
-               echo "<p><a class=\"navlink\" href=\"?action=confirm_drop_path&amp;{$misc->href}&amp;no_id={$_REQUEST['no_id']}&amp;path_id={$_REQUEST['path_id']}\">{$lang['strdrop']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"plugin_slony.php?action=confirm_drop_path&amp;{$misc->href}&amp;no_id={$_REQUEST['no_id']}&amp;path_id={$_REQUEST['path_id']}\">{$lang['strdrop']}</a></p>\n";
        }
 
        /**
@@ -951,7 +951,7 @@
                
                $misc->printTable($listens, $columns, $actions, $lang['strnolistens']);
 
-               echo "<p><a class=\"navlink\" href=\"?action=create_listen&amp;{$misc->href}&amp;no_id={$_REQUEST['no_id']}\">{$lang['strcreatelisten']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"plugin_slony.php?action=create_listen&amp;{$misc->href}&amp;no_id={$_REQUEST['no_id']}\">{$lang['strcreatelisten']}</a></p>\n";
        }
 
        /**
@@ -986,7 +986,7 @@
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
 
-               echo "<p><a class=\"navlink\" href=\"?action=confirm_drop_listen&amp;{$misc->href}&amp;no_id={$_REQUEST['no_id']}&amp;listen_id={$_REQUEST['listen_id']}&amp;origin_id={$listen->fields['li_origin']}\">{$lang['strdrop']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"plugin_slony.php?action=confirm_drop_listen&amp;{$misc->href}&amp;no_id={$_REQUEST['no_id']}&amp;listen_id={$_REQUEST['listen_id']}&amp;origin_id={$listen->fields['li_origin']}\">{$lang['strdrop']}</a></p>\n";
        }
 
        /**
@@ -1144,7 +1144,7 @@
                
                $misc->printTable($sets, $columns, $actions, $lang['strnorepsets']);
                
-               echo "<p><a class=\"navlink\" href=\"?action=create_set&amp;{$misc->href}\">{$lang['strcreaterepset']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"plugin_slony.php?action=create_set&amp;{$misc->href}\">{$lang['strcreaterepset']}</a></p>\n";
        }       
 
        /**
@@ -1185,12 +1185,12 @@
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
 
-               echo "<p><a class=\"navlink\" href=\"?action=confirm_drop_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strdrop']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"?action=confirm_lock_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strlock']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"?action=confirm_unlock_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strunlock']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"?action=merge_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strmerge']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"?action=move_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strmove']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"?action=execute_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strexecute']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"plugin_slony.php?action=confirm_drop_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strdrop']}</a> |\n";
+               echo "<a class=\"navlink\" href=\"plugin_slony.php?action=confirm_lock_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strlock']}</a> |\n";
+               echo "<a class=\"navlink\" href=\"plugin_slony.php?action=confirm_unlock_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strunlock']}</a> |\n";
+               echo "<a class=\"navlink\" href=\"plugin_slony.php?action=merge_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strmerge']}</a> |\n";
+               echo "<a class=\"navlink\" href=\"plugin_slony.php?action=move_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strmove']}</a> |\n";
+               echo "<a class=\"navlink\" href=\"plugin_slony.php?action=execute_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strexecute']}</a></p>\n";
        }
 
        /**
@@ -1538,7 +1538,7 @@
 
                $misc->printTable($tables, $columns, $actions, $lang['strnotables']);
                
-               echo "<p><a class=\"navlink\" href=\"?action=add_table&amp;stage=1&amp;set_id={$_REQUEST['set_id']}&amp;{$misc->href}\">{$lang['straddtable']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"plugin_slony.php?action=add_table&amp;stage=1&amp;set_id={$_REQUEST['set_id']}&amp;{$misc->href}\">{$lang['straddtable']}</a></p>\n";
        }
 
        /**
@@ -1808,7 +1808,7 @@
                
                $misc->printTable($sequences, $columns, $actions, $lang['strnosequences']);
                
-               echo "<p><a class=\"navlink\" href=\"?action=add_sequence&amp;stage=1&amp;set_id={$_REQUEST['set_id']}&amp;{$misc->href}\">{$lang['straddsequence']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"plugin_slony.php?action=add_sequence&amp;stage=1&amp;set_id={$_REQUEST['set_id']}&amp;{$misc->href}\">{$lang['straddsequence']}</a></p>\n";
        }
 
        /**

diff --git a/privileges.php b/privileges.php
index b62e992a17723aa79c074e0a2beac0e61955ad1d..5025d3ec9cd08017a99d3db593465a86cd9f1187 100644 (file)
--- a/privileges.php
+++ b/privileges.php
@@ -3,7 +3,7 @@
        /**
         * Manage privileges in a database
         *
-        * $Id: privileges.php,v 1.43 2007/07/12 19:26:22 xzilla Exp $
+        * $Id: privileges.php,v 1.44 2007/07/16 21:27:29 ioguix Exp $
         */
 
        // Include application functions
@@ -236,9 +236,9 @@
                
                if ($_REQUEST['subject'] == 'function') {
                        $objectoid = $_REQUEST[$_REQUEST['subject'].'_oid'];
-                       $alterurl = "?action=alter&{$misc->href}&{$subject}={$object}&{$subject}_oid=$objectoid&subject={$subject}&mode=";
+                       $alterurl = "privileges.php?action=alter&{$misc->href}&{$subject}={$object}&{$subject}_oid=$objectoid&subject={$subject}&mode=";
                } else {
-                       $alterurl = "?action=alter&{$misc->href}&{$subject}={$object}&subject={$subject}&mode=";
+                       $alterurl = "privileges.php?action=alter&{$misc->href}&{$subject}={$object}&subject={$subject}&mode=";
                }
        
                echo "<p><a class=\"navlink\" href=\"{$alterurl}grant\">{$lang['strgrant']}</a> |\n";

diff --git a/reports.php b/reports.php
index ca160f824f7e3d68edc9688c278d76d854cdd085..b397e25c7be07474c3455bc3bb24ccc2e18dff2c 100644 (file)
--- a/reports.php
+++ b/reports.php
@@ -3,7 +3,7 @@
        /**
         * List reports in a database
         *
-        * $Id: reports.php,v 1.30 2007/07/12 19:26:22 xzilla Exp $
+        * $Id: reports.php,v 1.31 2007/07/16 21:27:29 ioguix Exp $
         */
 
        // Include application functions
@@ -121,8 +121,8 @@
                }
                else echo "<p>{$lang['strinvalidparam']}</p>\n";
 
-               echo "<p><a class=\"navlink\" href=\"?{$misc->href}\">{$lang['strshowallreports']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"?action=edit&amp;{$misc->href}&amp;report_id={$report->fields['report_id']}\">{$lang['stredit']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"reports.php?{$misc->href}\">{$lang['strshowallreports']}</a> |\n";
+               echo "<a class=\"navlink\" href=\"reports.php?action=edit&amp;{$misc->href}&amp;report_id={$report->fields['report_id']}\">{$lang['stredit']}</a></p>\n";
        }
 
        /**
@@ -249,7 +249,7 @@
                        'report' => array(
                                'title' => $lang['strreport'],
                                'field' => 'report_name',
-                               'url'   => "?action=properties&amp;{$misc->href}&amp;",
+                               'url'   => "reports.php?action=properties&amp;{$misc->href}&amp;",
                                'vars'  => array('report_id' => 'report_id'),
                        ),
                        'database' => array(
@@ -269,7 +269,7 @@
                        ),
                );
                
-               $return_url = urlencode("?{$misc->href}");
+               $return_url = urlencode("reports.php?{$misc->href}");
                
                $actions = array(
                        'run' => array(
@@ -279,19 +279,19 @@
                        ),
                        'edit' => array(
                                'title' => $lang['stredit'],
-                               'url'   => "?action=edit&amp;{$misc->href}&amp;",
+                               'url'   => "reports.php?action=edit&amp;{$misc->href}&amp;",
                                'vars'  => array('report_id' => 'report_id'),
                        ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "?action=confirm_drop&amp;{$misc->href}&amp;",
+                               'url'   => "reports.php?action=confirm_drop&amp;{$misc->href}&amp;",
                                'vars'  => array('report_id' => 'report_id'),
                        ),
                );
                
                $misc->printTable($reports, $columns, $actions, $lang['strnoreports']);
                
-               echo "<p><a class=\"navlink\" href=\"?action=create&amp;{$misc->href}\">{$lang['strcreatereport']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"reports.php?action=create&amp;{$misc->href}\">{$lang['strcreatereport']}</a></p>\n";
        }
        
        $misc->printHeader($lang['strreports']);

diff --git a/roles.php b/roles.php
index b0af6e189e285f29f4b70f0bb1d706865ba730c7..8944b019be1362435efe0813c48a0422e9e3ed65 100644 (file)
--- a/roles.php
+++ b/roles.php
@@ -3,7 +3,7 @@
        /**
         * Manage roles in a database cluster
         *
-        * $Id: roles.php,v 1.8 2007/07/12 19:26:22 xzilla Exp $
+        * $Id: roles.php,v 1.9 2007/07/16 21:27:29 ioguix Exp $
         */
 
        // Include application functions
@@ -425,10 +425,10 @@
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
 
-               echo "<p><a class=\"navlink\" href=\"?{$misc->href}\">{$lang['strshowallroles']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"?action=alter&amp;{$misc->href}&amp;rolename=", 
+               echo "<p><a class=\"navlink\" href=\"roles.php?{$misc->href}\">{$lang['strshowallroles']}</a> |\n";
+               echo "<a class=\"navlink\" href=\"roles.php?action=alter&amp;{$misc->href}&amp;rolename=", 
                        urlencode($_REQUEST['rolename']), "\">{$lang['stralter']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"?action=confirm_drop&amp;{$misc->href}&amp;rolename=",
+               echo "<a class=\"navlink\" href=\"roles.php?action=confirm_drop&amp;{$misc->href}&amp;rolename=",
                        urlencode($_REQUEST['rolename']), "\">{$lang['strdrop']}</a>\n";
        }
 
@@ -478,7 +478,7 @@
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
                
-               echo "<p><a class=\"navlink\" href=\"?action=confchangepassword&amp;{$misc->href}\">{$lang['strchangepassword']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"roles.php?action=confchangepassword&amp;{$misc->href}\">{$lang['strchangepassword']}</a></p>\n";
        }
        
        /**
@@ -606,19 +606,19 @@
                $actions = array(
                        'alter' => array(
                                'title' => $lang['stralter'],
-                               'url'   => "?action=alter&amp;{$misc->href}&amp;",
+                               'url'   => "roles.php?action=alter&amp;{$misc->href}&amp;",
                                'vars'  => array('rolename' => 'rolname'),
                        ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "?action=confirm_drop&amp;{$misc->href}&amp;",
+                               'url'   => "roles.php?action=confirm_drop&amp;{$misc->href}&amp;",
                                'vars'  => array('rolename' => 'rolname'),
                        ),
                );
                
                $misc->printTable($roles, $columns, $actions, $lang['strnoroles']);
 
-               echo "<p><a class=\"navlink\" href=\"?action=create&amp;{$misc->href}\">{$lang['strcreaterole']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"roles.php?action=create&amp;{$misc->href}\">{$lang['strcreaterole']}</a></p>\n";
 
        }
 

diff --git a/rules.php b/rules.php
index b53a9e400184e4e5194a628cc47e692fc32984b0..c0225f9528c821c63fb4fdcae8f56fa338bab76f 100644 (file)
--- a/rules.php
+++ b/rules.php
@@ -3,7 +3,7 @@
        /**
         * List rules on a table OR view
         *
-        * $Id: rules.php,v 1.31 2007/07/12 19:26:22 xzilla Exp $
+        * $Id: rules.php,v 1.32 2007/07/16 21:27:29 ioguix Exp $
         */
 
        // Include application functions
@@ -153,14 +153,14 @@
                $actions = array(
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "?action=confirm_drop&{$misc->href}&reltype={$subject}&{$subject}={$object}&subject=rule&",
+                               'url'   => "rules.php?action=confirm_drop&{$misc->href}&reltype={$subject}&{$subject}={$object}&subject=rule&",
                                'vars'  => array('rule' => 'rulename'),
                        ),
                );
 
                $misc->printTable($rules, $columns, $actions, $lang['strnorules']);
 
-               echo "<p><a class=\"navlink\" href=\"?action=create_rule&amp;{$misc->href}&amp;{$subject}={$object}&amp;subject={$subject}\">{$lang['strcreaterule']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"rules.php?action=create_rule&amp;{$misc->href}&amp;{$subject}={$object}&amp;subject={$subject}\">{$lang['strcreaterule']}</a></p>\n";
        }
 
        function doTree() {

diff --git a/schemas.php b/schemas.php
index cf824d50d03e7caa0b3678452bfefd4314c77414..90a987f194e776247d6a199b57de4aaf90aeaa23 100755 (executable)
--- a/schemas.php
+++ b/schemas.php
@@ -3,7 +3,7 @@
        /**
         * Manage schemas in a database
         *
-        * $Id: schemas.php,v 1.17 2007/07/12 19:26:22 xzilla Exp $
+        * $Id: schemas.php,v 1.18 2007/07/16 21:27:29 ioguix Exp $
         */
 
        // Include application functions
@@ -50,7 +50,7 @@
                        $actions = array(
                                'drop' => array(
                                        'title' => $lang['strdrop'],
-                                       'url'   => "?action=drop&{$misc->href}&",
+                                       'url'   => "schemas.php?action=drop&{$misc->href}&",
                                        'vars'  => array('schema' => 'nspname'),
                                ),
                                'privileges' => array(
@@ -60,14 +60,14 @@
                                ),
                                'alter' => array(
                                        'title' => $lang['stralter'],
-                                       'url'   => "?action=alter&{$misc->href}&",
+                                       'url'   => "schemas.php?action=alter&{$misc->href}&",
                                        'vars'  => array('schema' => 'nspname'),
                                ),
                        );
                        
                        $misc->printTable($schemas, $columns, $actions, $lang['strnoschemas']);
 
-                       echo "<p><a class=\"navlink\" href=\"?action=create&amp;{$misc->href}\">{$lang['strcreateschema']}</a></p>\n";
+                       echo "<p><a class=\"navlink\" href=\"schemas.php?action=create&amp;{$misc->href}\">{$lang['strcreateschema']}</a></p>\n";
                } else {
                        // If the database does not support schemas...
                        echo "<p>{$lang['strnoschemas']}</p>\n";

diff --git a/sequences.php b/sequences.php
index fa48e675a226f2162dea9ca467c698e9381000d5..257d4dd75e4872b11e33c1c48b316f94df50e544 100644 (file)
--- a/sequences.php
+++ b/sequences.php
@@ -3,7 +3,7 @@
        /**
         * Manage sequences in a database
         *
-        * $Id: sequences.php,v 1.41 2007/07/12 19:26:22 xzilla Exp $
+        * $Id: sequences.php,v 1.42 2007/07/16 21:27:29 ioguix Exp $
         */
        
        // Include application functions
@@ -30,7 +30,7 @@
                        'sequence' => array(
                                'title' => $lang['strsequence'],
                                'field' => 'seqname',
-                               'url'   => "?action=properties&{$misc->href}&",
+                               'url'   => "sequences.php?action=properties&{$misc->href}&",
                                'vars'  => array('sequence' => 'seqname'),
                        ),
                        'owner' => array(
@@ -54,7 +54,7 @@
                        ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "?action=confirm_drop&{$misc->href}&",
+                               'url'   => "sequences.php?action=confirm_drop&{$misc->href}&",
                                'vars'  => array('sequence' => 'seqname'),
                        ),
                        'privileges' => array(
@@ -67,7 +67,7 @@
                if (!$data->hasAlterSequence()) unset($actions['alter']);
                $misc->printTable($sequences, $columns, $actions, $lang['strnosequences']);
                
-               echo "<p><a class=\"navlink\" href=\"?action=create&amp;{$misc->href}\">{$lang['strcreatesequence']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"sequences.php?action=create&amp;{$misc->href}\">{$lang['strcreatesequence']}</a></p>\n";
        }
        
        /**
@@ -145,12 +145,12 @@
                        echo "</table>";
                        
                        if ($data->hasAlterSequence()) {
-                               echo "<p><a class=\"navlink\" href=\"?action=confirm_alter&amp;{$misc->href}&amp;sequence=", urlencode($sequence->fields['seqname']), "\">{$lang['stralter']}</a> |\n";
+                               echo "<p><a class=\"navlink\" href=\"sequences.php?action=confirm_alter&amp;{$misc->href}&amp;sequence=", urlencode($sequence->fields['seqname']), "\">{$lang['stralter']}</a> |\n";
                        }
-                       echo "<a class=\"navlink\" href=\"?action=confirm_setval&amp;{$misc->href}&amp;sequence=", urlencode($sequence->fields['seqname']), "\">{$lang['strsetval']}</a> |\n";
-                       echo "<a class=\"navlink\" href=\"?action=nextval&amp;{$misc->href}&amp;sequence=", urlencode($sequence->fields['seqname']), "\">{$lang['strnextval']}</a> |\n";
-                       echo "<a class=\"navlink\" href=\"?action=reset&amp;{$misc->href}&amp;sequence=", urlencode($sequence->fields['seqname']), "\">{$lang['strreset']}</a> |\n";
-                       echo "<a class=\"navlink\" href=\"?{$misc->href}\">{$lang['strshowallsequences']}</a></p>\n";
+                       echo "<a class=\"navlink\" href=\"sequences.php?action=confirm_setval&amp;{$misc->href}&amp;sequence=", urlencode($sequence->fields['seqname']), "\">{$lang['strsetval']}</a> |\n";
+                       echo "<a class=\"navlink\" href=\"sequences.php?action=nextval&amp;{$misc->href}&amp;sequence=", urlencode($sequence->fields['seqname']), "\">{$lang['strnextval']}</a> |\n";
+                       echo "<a class=\"navlink\" href=\"sequences.php?action=reset&amp;{$misc->href}&amp;sequence=", urlencode($sequence->fields['seqname']), "\">{$lang['strreset']}</a> |\n";
+                       echo "<a class=\"navlink\" href=\"sequences.php?{$misc->href}\">{$lang['strshowallsequences']}</a></p>\n";
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
        }

diff --git a/servers.php b/servers.php
index 347e15addbacc6a9418bfae2163083889f610a9b..81420cddbb943fbc3321debe36c5f536dbee129e 100644 (file)
--- a/servers.php
+++ b/servers.php
@@ -3,7 +3,7 @@
        /**
         * Manage servers
         *
-        * $Id: servers.php,v 1.9 2007/07/12 19:26:22 xzilla Exp $
+        * $Id: servers.php,v 1.10 2007/07/16 21:27:29 ioguix Exp $
         */
 
        // Include application functions
@@ -64,7 +64,7 @@
                $actions = array(
                        'logout' => array(
                                'title' => $lang['strlogout'],
-                               'url'   => "?action=logout&",
+                               'url'   => "servers.php?action=logout&",
                                'vars'  => array('logoutServer' => 'id'),
                        ),
                );

diff --git a/tables.php b/tables.php
index a42993204313e377b73069e1af3ebe4c102f0941..aefd7193575f4258e1958c5ca0ee789f306d04e3 100644 (file)
--- a/tables.php
+++ b/tables.php
@@ -3,7 +3,7 @@
        /**
         * List tables in a database
         *
-        * $Id: tables.php,v 1.98 2007/07/12 19:26:22 xzilla Exp $
+        * $Id: tables.php,v 1.99 2007/07/16 21:27:29 ioguix Exp $
         */
 
        // Include application functions
@@ -837,32 +837,32 @@
                        ),
                        'select' => array(
                                'title' => $lang['strselect'],
-                               'url'   => "?action=confselectrows&{$misc->href}&",
+                               'url'   => "tables.php?action=confselectrows&{$misc->href}&",
                                'vars'  => array('table' => 'relname'),
                        ),
                        'insert' => array(
                                'title' => $lang['strinsert'],
-                               'url'   => "?action=confinsertrow&{$misc->href}&",
+                               'url'   => "tables.php?action=confinsertrow&{$misc->href}&",
                                'vars'  => array('table' => 'relname'),
                        ),
                        'empty' => array(
                                'title' => $lang['strempty'],
-                               'url'   => "?action=confirm_empty&{$misc->href}&",
+                               'url'   => "tables.php?action=confirm_empty&{$misc->href}&",
                                'vars'  => array('table' => 'relname'),
                        ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "?action=confirm_drop&{$misc->href}&",
+                               'url'   => "tables.php?action=confirm_drop&{$misc->href}&",
                                'vars'  => array('table' => 'relname'),
                        ),
                        'vacuum' => array(
                                'title' => $lang['strvacuum'],
-                               'url'   => "?action=confirm_vacuum&{$misc->href}&",
+                               'url'   => "tables.php?action=confirm_vacuum&{$misc->href}&",
                                'vars'  => array('table' => 'relname'),
                        ),
                        'analyze' => array(
                                'title' => $lang['stranalyze'],
-                               'url'   => "?action=confirm_analyze&{$misc->href}&",
+                               'url'   => "tables.php?action=confirm_analyze&{$misc->href}&",
                                'vars'  => array('table' => 'relname'),
                        ),
                );
@@ -872,7 +872,7 @@
 
                $misc->printTable($tables, $columns, $actions, $lang['strnotables'], null, $multiactions);
 
-               echo "<p><a class=\"navlink\" href=\"?action=create&amp;{$misc->href}\">{$lang['strcreatetable']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"tables.php?action=create&amp;{$misc->href}\">{$lang['strcreatetable']}</a></p>\n";
        }
        
        /**

diff --git a/tablespaces.php b/tablespaces.php
index 2902a71da0661d00ff5aab363b0c5c3b93b8d3ce..a65a69476379cf49bbe2f144cd0b141378f3a83f 100755 (executable)
--- a/tablespaces.php
+++ b/tablespaces.php
@@ -3,7 +3,7 @@
        /**
         * Manage tablespaces in a database cluster
         *
-        * $Id: tablespaces.php,v 1.14 2007/07/12 19:26:22 xzilla Exp $
+        * $Id: tablespaces.php,v 1.15 2007/07/16 21:27:29 ioguix Exp $
         */
 
        // Include application functions
@@ -239,12 +239,12 @@
                $actions = array(
                        'alter' => array(
                                'title' => $lang['stralter'],
-                               'url'   => "?action=edit&{$misc->href}&",
+                               'url'   => "tablespaces.php?action=edit&{$misc->href}&",
                                'vars'  => array('tablespace' => 'spcname')
                        ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "?action=confirm_drop&{$misc->href}&",
+                               'url'   => "tablespaces.php?action=confirm_drop&{$misc->href}&",
                                'vars'  => array('tablespace' => 'spcname')
                        ),
                        'privileges' => array(
@@ -256,7 +256,7 @@
                                
                $misc->printTable($tablespaces, $columns, $actions, $lang['strnotablespaces']);
                
-               echo "<p><a class=\"navlink\" href=\"?action=create&amp;{$misc->href}\">{$lang['strcreatetablespace']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"tablespaces.php?action=create&amp;{$misc->href}\">{$lang['strcreatetablespace']}</a></p>\n";
 
        }
 

diff --git a/tblproperties.php b/tblproperties.php
index d008f31efc467e637b6dbcfae293f49809288bdb..b95048a423c6e41d5782e00ef63915aecb18c310 100644 (file)
--- a/tblproperties.php
+++ b/tblproperties.php
@@ -3,7 +3,7 @@
        /**
         * List tables in a database
         *
-        * $Id: tblproperties.php,v 1.82 2007/07/12 19:26:22 xzilla Exp $
+        * $Id: tblproperties.php,v 1.83 2007/07/16 21:27:29 ioguix Exp $
         */
 
        // Include application functions
@@ -487,7 +487,7 @@
                        ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "?action=confirm_drop&{$misc->href}&table=".urlencode($_REQUEST['table'])."&",
+                               'url'   => "tblproperties.php?action=confirm_drop&{$misc->href}&table=".urlencode($_REQUEST['table'])."&",
                                'vars'  => array('column' => 'attname'),
                        ),
                );

diff --git a/triggers.php b/triggers.php
index f29ffc0f4be03cd1747e93775de06484c2c99268..035b9433e5b5b938a9b30722cba33c75879c4d2e 100644 (file)
--- a/triggers.php
+++ b/triggers.php
@@ -3,7 +3,7 @@
        /**
         * List triggers on a table
         *
-        * $Id: triggers.php,v 1.34 2007/07/12 19:26:22 xzilla Exp $
+        * $Id: triggers.php,v 1.35 2007/07/16 21:27:29 ioguix Exp $
         */
 
        // Include application functions
@@ -295,12 +295,12 @@
                $actions = array(
                        'alter' => array(
                                'title' => $lang['stralter'],
-                               'url'   => "?action=confirm_alter&{$misc->href}&table=".urlencode($_REQUEST['table'])."&",
+                               'url'   => "triggers.php?action=confirm_alter&{$misc->href}&table=".urlencode($_REQUEST['table'])."&",
                                'vars'  => array('trigger' => 'tgname'),
                        ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "?action=confirm_drop&{$misc->href}&table=".urlencode($_REQUEST['table'])."&",
+                               'url'   => "triggers.php?action=confirm_drop&{$misc->href}&table=".urlencode($_REQUEST['table'])."&",
                                'vars'  => array('trigger' => 'tgname'),
                        ),
                );
@@ -308,13 +308,13 @@
                        if(!$data->phpBool($triggers->fields["tgenabled"])) {
                                $actions['enable'] = array(
                                        'title' => $lang['strenable'],
-                                       'url'   => "?action=confirm_enable&{$misc->href}&table=".urlencode($_REQUEST['table'])."&",
+                                       'url'   => "triggers.php?action=confirm_enable&{$misc->href}&table=".urlencode($_REQUEST['table'])."&",
                                        'vars'  => array('trigger' => 'tgname'),
                                );
                        } else {
                                $actions['disable'] = array(
                                        'title' => $lang['strdisable'],
-                                       'url'   => "?action=confirm_disable&{$misc->href}&table=".urlencode($_REQUEST['table'])."&",
+                                       'url'   => "triggers.php?action=confirm_disable&{$misc->href}&table=".urlencode($_REQUEST['table'])."&",
                                        'vars'  => array('trigger' => 'tgname'),
                                );
                        }
@@ -324,7 +324,7 @@
                
                $misc->printTable($triggers, $columns, $actions, $lang['strnotriggers'], 'tgPre');
                
-               echo "<p><a class=\"navlink\" href=\"?action=create&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']), "\">{$lang['strcreatetrigger']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"triggers.php?action=create&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']), "\">{$lang['strcreatetrigger']}</a></p>\n";
        }
 
        function doTree() {

diff --git a/types.php b/types.php
index ce8f3b658327c857c41b4adac9875bf987f94891..765f9fb1c3547ee1fcb8b9696fb26e916d73dbd2 100644 (file)
--- a/types.php
+++ b/types.php
@@ -3,7 +3,7 @@
        /**
         * Manage types in a database
         *
-        * $Id: types.php,v 1.37 2007/07/12 19:26:22 xzilla Exp $
+        * $Id: types.php,v 1.38 2007/07/16 21:27:29 ioguix Exp $
         */
 
        // Include application functions
@@ -75,7 +75,7 @@
                                echo "</table>\n";
                        }
 
-                       echo "<p><a class=\"navlink\" href=\"?{$misc->href}\">{$lang['strshowalltypes']}</a></p>\n";
+                       echo "<p><a class=\"navlink\" href=\"types.php?{$misc->href}\">{$lang['strshowalltypes']}</a></p>\n";
                } else
                        doDefault($lang['strinvalidparam']);
        }
@@ -405,7 +405,7 @@
                        'type' => array(
                                'title' => $lang['strtype'],
                                'field' => 'typname',
-                               'url'   => "?action=properties&amp;{$misc->href}&amp;",
+                               'url'   => "types.php?action=properties&amp;{$misc->href}&amp;",
                                'vars'  => array('type' => 'basename'),
                        ),
                        'owner' => array(
@@ -440,16 +440,16 @@
                $actions = array(
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "?action=confirm_drop&amp;{$misc->href}&amp;",
+                               'url'   => "types.php?action=confirm_drop&amp;{$misc->href}&amp;",
                                'vars'  => array('type' => 'basename'),
                        ),
                );
                
                $misc->printTable($types, $columns, $actions, $lang['strnotypes']);
 
-               echo "<p><a class=\"navlink\" href=\"?action=create&amp;{$misc->href}\">{$lang['strcreatetype']}</a>";
+               echo "<p><a class=\"navlink\" href=\"types.php?action=create&amp;{$misc->href}\">{$lang['strcreatetype']}</a>";
                if ($data->hasCompositeTypes())
-                       echo "\n| <a class=\"navlink\" href=\"?action=create_comp&amp;{$misc->href}\">{$lang['strcreatecomptype']}</a>";
+                       echo "\n| <a class=\"navlink\" href=\"types.php?action=create_comp&amp;{$misc->href}\">{$lang['strcreatecomptype']}</a>";
                echo "</p>\n";
 
        }

diff --git a/users.php b/users.php
index 9f683428179b9c12fbd9e119009a6da3067ca110..f1c5c7583c682d0baf557502e916d49c7e715e0a 100644 (file)
--- a/users.php
+++ b/users.php
@@ -3,7 +3,7 @@
        /**
         * Manage users in a database cluster
         *
-        * $Id: users.php,v 1.37 2007/07/12 19:26:22 xzilla Exp $
+        * $Id: users.php,v 1.38 2007/07/16 21:27:29 ioguix Exp $
         */
 
        // Include application functions
@@ -47,7 +47,7 @@
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
                
-               echo "<p><a class=\"navlink\" href=\"?action=confchangepassword&amp;{$misc->href}\">{$lang['strchangepassword']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"users.php?action=confchangepassword&amp;{$misc->href}\">{$lang['strchangepassword']}</a></p>\n";
        }
        
        /**
@@ -318,12 +318,12 @@
                $actions = array(
                        'alter' => array(
                                'title' => $lang['stralter'],
-                               'url'   => "?action=edit&amp;{$misc->href}&amp;",
+                               'url'   => "users.php?action=edit&amp;{$misc->href}&amp;",
                                'vars'  => array('username' => 'usename'),
                        ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "?action=confirm_drop&amp;{$misc->href}&amp;",
+                               'url'   => "users.php?action=confirm_drop&amp;{$misc->href}&amp;",
                                'vars'  => array('username' => 'usename'),
                        ),
                );
@@ -332,7 +332,7 @@
                
                $misc->printTable($users, $columns, $actions, $lang['strnousers']);
 
-               echo "<p><a class=\"navlink\" href=\"?action=create&amp;{$misc->href}\">{$lang['strcreateuser']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"users.php?action=create&amp;{$misc->href}\">{$lang['strcreateuser']}</a></p>\n";
 
        }
 

diff --git a/viewproperties.php b/viewproperties.php
index 2e979278114c4819e275516f06edbf2f41ba9ce6..803aeadc8d80fee5620d1283d17ed7e2c47a14f6 100755 (executable)
--- a/viewproperties.php
+++ b/viewproperties.php
@@ -3,7 +3,7 @@
        /**
         * List views in a database
         *
-        * $Id: viewproperties.php,v 1.29 2007/07/12 19:26:22 xzilla Exp $
+        * $Id: viewproperties.php,v 1.30 2007/07/16 21:27:29 ioguix Exp $
         */
 
        // Include application functions
@@ -150,7 +150,7 @@
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
                
-               echo "<p><a class=\"navlink\" href=\"?action=edit&amp;{$misc->href}&amp;view=", 
+               echo "<p><a class=\"navlink\" href=\"viewproperties.php?action=edit&amp;{$misc->href}&amp;view=", 
                        urlencode($_REQUEST['view']), "\">{$lang['stralter']}</a></p>\n";
        }
 
@@ -332,7 +332,7 @@
                $actions = array(
                        'alter' => array(
                                'title' => $lang['stralter'],
-                               'url'   => "?action=properties&amp;{$misc->href}&amp;view=".urlencode($_REQUEST['view'])."&amp;",
+                               'url'   => "viewproperties.php?action=properties&amp;{$misc->href}&amp;view=".urlencode($_REQUEST['view'])."&amp;",
                                'vars'  => array('column' => 'attname'),
                        ),
                );

diff --git a/views.php b/views.php
index 18bd0b541a9d5e306b544258d68e87baf5cba2df..15dcdfb951c0d29fb4a8e305579710157a95884f 100644 (file)
--- a/views.php
+++ b/views.php
@@ -3,7 +3,7 @@
        /**
         * Manage views in a database
         *
-        * $Id: views.php,v 1.71 2007/07/12 19:26:22 xzilla Exp $
+        * $Id: views.php,v 1.72 2007/07/16 21:27:29 ioguix Exp $
         */
 
        // Include application functions
@@ -572,28 +572,28 @@
                        ),
                        'select' => array(
                                'title' => $lang['strselect'],
-                               'url'   => "?action=confselectrows&{$misc->href}&",
+                               'url'   => "views.php?action=confselectrows&{$misc->href}&",
                                'vars'  => array('view' => 'relname'),
                        ),
                        
 // Insert is possible if the relevant rule for the view has been created.
 //                     'insert' => array(
 //                             'title' => $lang['strinsert'],
-//                             'url'   => "?action=confinsertrow&{$misc->href}&",
+//                             'url'   => "views.php?action=confinsertrow&{$misc->href}&",
 //                             'vars'  => array('view' => 'relname'),
 //                     ),
 
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "?action=confirm_drop&{$misc->href}&",
+                               'url'   => "views.php?action=confirm_drop&{$misc->href}&",
                                'vars'  => array('view' => 'relname'),
                        ),
                );
                
                $misc->printTable($views, $columns, $actions, $lang['strnoviews']);
                
-               echo "<p><a class=\"navlink\" href=\"?action=create&amp;{$misc->href}\">{$lang['strcreateview']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"?action=wiz_create&amp;{$misc->href}\">{$lang['strcreateviewwiz']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"views.php?action=create&amp;{$misc->href}\">{$lang['strcreateview']}</a> |\n";
+               echo "<a class=\"navlink\" href=\"views.php?action=wiz_create&amp;{$misc->href}\">{$lang['strcreateviewwiz']}</a></p>\n";
 
        }