merge changes from DEV_RMPHPSELF into REL_4_1 stable
authorxzilla <xzilla>
Mon, 9 Jul 2007 14:55:21 +0000 (14:55 +0000)
committerxzilla <xzilla>
Mon, 9 Jul 2007 14:55:21 +0000 (14:55 +0000)
45 files changed:
DEVELOPERS
HISTORY
aggregates.php
all_db.php
casts.php
classes/Misc.php
colproperties.php
constraints.php
conversions.php
database.php
dataexport.php
display.php
domains.php
functions.php
groups.php
indexes.php
intro.php
lang/english.php
lang/french.php
lang/recoded/english.php
lang/recoded/french.php
lang/recoded/spanish.php
lang/spanish.php
languages.php
libraries/lib.inc.php
login.php
operators.php
plugin_slony.php
privileges.php
redirect.php
reports.php
roles.php
rules.php
schemas.php
sequences.php
servers.php
sqledit.php
tables.php
tablespaces.php
tblproperties.php
triggers.php
types.php
users.php
viewproperties.php
views.php

index c80e2880518c35ec9194009c0c383239f3a10912..3f01acdc830218fd72d79a7fe7b45df9561e5251 100644 (file)
@@ -71,7 +71,10 @@ odd characters in user input.  Examine existing functions that do similar
 things to yours to get yours right.
 
 When writing data to the display, you should always urlencode() variables in
-HREFs and htmlspecialchars() variables in forms.
+HREFs and htmlspecialchars() variables in forms.  Rather than use action=""
+attributes in HTML form elements use action="thisformname.php".  This
+ensures that browsers remove query strings when expanding the given
+relative URL into a full URL.
 
 When working with CVS, always make sure to do a 'cvs update' both before you 
 start; so you have the latest code to work with; and also again before you 
@@ -98,7 +101,7 @@ This is the general form for looping over a recordset:
 $rs = $class->getResults();
 if (is_object($rs) && $rs->recordCount() > 0) {
        while (!$rs->EOF) {
-               echo $rs->fields['field'];
+               echo $rs->f['field'];
                $rs->moveNext();
        }
 }
diff --git a/HISTORY b/HISTORY
index 9eeac787bbb96a6975623f767ac6c17c2050bc47..07f87f2b6fecab515e495650f475d8e6ccb267c4 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,14 @@
 phpPgAdmin History
 ------------------
 
+Version 4.1.3-rc-1
+-------------
+
+Bugs
+* Eliminate use of $_SERVER['PHP_SELF']. This fixes a regression in 4.1.2 for 
+  non-mainstream locales (including SQL_ASCII)
+* Validate client supplied server against entries in config.inc.php 
+
 Version 4.1.2
 -------------
 
@@ -18,7 +26,8 @@ Version 4.1.1
 -------------
 
 Bugs
-* Fix problem where failed update would report as duplicate update error and fail to return edit screen
+* Fix problem where failed update would report as duplicate update error and 
+  fail to return edit screen
 * Fix error when using $conf[owned_only] on 8.1 & 8.2 
 * Fix error displaying schema names for parents of inherited tables
 * Clean up non-standard escape warnings for PostgreSQL 8.2
index 8c266b92d9b432208585bbdc909375bd2a912176..0aa17a3fe9605ed406ab50b119bbf5dcffeca8a1 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage aggregates in a database
         *
-        * $Id: aggregates.php,v 1.15.2.1 2007/05/28 17:21:55 ioguix Exp $
+        * $Id: aggregates.php,v 1.15.2.2 2007/07/09 14:55:21 xzilla Exp $
         */
 
        // Include application functions
@@ -53,7 +53,7 @@
         */
        function doCreate($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if (!isset($_REQUEST['name'])) $_REQUEST['name'] = '';
                if (!isset($_REQUEST['basetype'])) $_REQUEST['basetype'] = '';
@@ -68,7 +68,7 @@
                $misc->printTitle($lang['strcreateaggregate'], 'pg.aggregate.create');
                $misc->printMsg($msg);
                                
-               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+               echo "<form action=\"aggregates.php\" method=\"post\">\n";
                echo "<table>\n";
                echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strname']}</th>\n";
                echo "\t\t<td class=\"data\"><input name=\"name\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"", 
         */
        function doAlter($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                $misc->printTrail('aggregate');
                $misc->printTitle($lang['stralteraggregate'], 'pg.aggregate.alter');
                $misc->printMsg($msg);
 
-               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+               echo "<form action=\"aggregates.php\" method=\"post\">\n";
                $aggrdata = $data->getAggregate($_REQUEST['aggrname'], $_REQUEST['aggrtype']);
                if($aggrdata->recordCount() > 0 ) {
                        // Output table header
        function doDrop($confirm) {
                global $data, $misc;
                global $lang, $_reload_browser;
-               global $PHP_SELF;
 
                if ($confirm) {
                        $misc->printTrail('aggregate');
 
                        echo "<p>", sprintf($lang['strconfdropaggregate'], htmlspecialchars($_REQUEST['aggrname'])), "</p>\n";
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"aggregates.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
                        echo "<input type=\"hidden\" name=\"aggrname\" value=\"", htmlspecialchars($_REQUEST['aggrname']), "\" />\n";
                        echo "<input type=\"hidden\" name=\"aggrtype\" value=\"", htmlspecialchars($_REQUEST['aggrtype']), "\" />\n";
         */
        function doProperties($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                $misc->printTrail('aggregate');
                $misc->printTitle($lang['strproperties'],'pg.aggregate');
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
 
-               echo "<p><a class=\"navlink\" href=\"$PHP_SELF?{$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=\"$PHP_SELF?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=\"$PHP_SELF?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>\n";
        }
 
         */
        function doDefault($msg = '') {
                global $data, $conf, $misc;     
-               global $PHP_SELF, $lang;
+               global $lang;
 
                $misc->printTrail('schema');
                $misc->printTabs('schema', 'aggregates');
                        ),              
                        'alter' => array(
                                'title' => $lang['stralter'],
-                               'url'   => "{$PHP_SELF}?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'   => "{$PHP_SELF}?action=confirm_drop&amp;{$misc->href}&amp;",
+                               'url'   => "aggregates.php?action=confirm_drop&amp;{$misc->href}&amp;",
                                'vars'  => array('aggrname' => 'proname', 'aggrtype' => 'proargtypes'),
                        )
                );
                if (!$data->hasAlterAggregate()) unset($actions['alter']);
                $misc->printTable($aggregates, $columns, $actions, $lang['strnoaggregates']);
                
-               echo "<p><a class=\"navlink\" href=\"$PHP_SELF?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";
        }
 
        /**
index 677726c19557f2e353c2f76a65f4f2111fa17e1d..24ca0238008906e4125ed0342ae7d55d893b8f69 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage databases within a server
         *
-        * $Id: all_db.php,v 1.45.2.1 2007/05/28 17:21:55 ioguix Exp $
+        * $Id: all_db.php,v 1.45.2.2 2007/07/09 14:55:21 xzilla Exp $
         */
 
        // Include application functions
         */
        function doAlter($confirm) {
                global $data, $misc, $_reload_browser;
-               global $PHP_SELF, $lang;
+               global $lang;
        
                if ($confirm) {
                        $misc->printTrail('database');
                        $misc->printTitle($lang['stralter'], 'pg.database.alter');
                        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"all_db.php\" method=\"post\">\n";
                        echo "<table>\n";
                        echo "<tr><th class=\"data left required\">{$lang['strname']}</th>\n";
                        echo "<td class=\"data1\">";
         */
        function doDrop($confirm) {
                global $data, $misc;
-               global $PHP_SELF, $lang, $_reload_drop_database;
+               global $lang, $_reload_drop_database;
 
                if ($confirm) {
                        $misc->printTrail('database');
                        $misc->printTitle($lang['strdrop'], 'pg.database.drop');
                        
                        echo "<p>", sprintf($lang['strconfdropdatabase'], $misc->printVal($_REQUEST['dropdatabase'])), "</p>\n";        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"all_db.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
                        echo $misc->form;
                        echo "<input type=\"hidden\" name=\"dropdatabase\" value=\"", htmlspecialchars($_REQUEST['dropdatabase']), "\" />\n";
         */
        function doCreate($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $misc->printTrail('server');
                $misc->printTitle($lang['strcreatedatabase'], 'pg.database.create');
                // Fetch all tablespaces from the database
                if ($data->hasTablespaces()) $tablespaces = $data->getTablespaces();
 
-               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+               echo "<form action=\"all_db.php\" method=\"post\">\n";
                echo "<table>\n";
                echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strname']}</th>\n";
                echo "\t\t<td class=\"data1\"><input name=\"formName\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
         */
        function doExport($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                $misc->printTrail('server');
                $misc->printTabs('server','export');
         */
        function doDefault($msg = '') {
                global $data, $conf, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                $misc->printTrail('server');
                $misc->printTabs('server','databases');
                        ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "{$PHP_SELF}?action=confirm_drop&amp;subject=database&amp;{$misc->href}&amp;",
+                               'url'   => "all_db.php?action=confirm_drop&amp;subject=database&amp;{$misc->href}&amp;",
                                'vars'  => array('dropdatabase' => 'datname'),
                        ),
                        'privileges' => array(
                if ($data->hasAlterDatabase() ) {
                        $actions['alter'] = array(
                                'title' => $lang['stralter'],
-                               'url'   => "{$PHP_SELF}?action=confirm_alter&amp;subject=database&amp;{$misc->href}&amp;",
+                               'url'   => "all_db.php?action=confirm_alter&amp;subject=database&amp;{$misc->href}&amp;",
                                'vars'  => array('alterdatabase' => 'datname')
                        );
                }
                
                $misc->printTable($databases, $columns, $actions, $lang['strnodatabases']);
 
-               echo "<p><a class=\"navlink\" href=\"$PHP_SELF?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";
 
        }
        
index b4ccce4d7449a927cb24d17778077c4a75139fa5..2f9fb5e09a3577ff8259c6d1a92615ea4ac455df 100644 (file)
--- a/casts.php
+++ b/casts.php
@@ -3,7 +3,7 @@
        /**
         * Manage casts in a database
         *
-        * $Id: casts.php,v 1.12.2.1 2007/05/28 17:21:56 ioguix Exp $
+        * $Id: casts.php,v 1.12.2.2 2007/07/09 14:55:21 xzilla Exp $
         */
 
        // Include application functions
@@ -17,7 +17,7 @@
         */
        function doDefault($msg = '') {
                global $data, $misc, $database;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                function renderCastContext($val) {
                        global $lang;
index 4848efb64c6f66bf63b8953a7f9c5629d0229b4f..fe329c2f680b4ac7763fab47a5dd5a6bf5630115 100644 (file)
@@ -2,7 +2,7 @@
        /**
         * Class to hold various commonly used functions
         *
-        * $Id: Misc.php,v 1.138 2007/01/10 01:56:06 soranzo Exp $
+        * $Id: Misc.php,v 1.137.2.1 2007/07/09 14:55:23 xzilla Exp $
         */
         
        class Misc {
                 *                      $columns = array(
                 *                              column_id => array(
                 *                                      'title' => Column heading,
-                *                                      'field' => Field name for $tabledata->fields[...],
+                *                                      'field' => Field name for $tabledata->f[...],
                 *                                      'help'  => Help page for this column,
                 *                              ), ...
                 *                      );
                 */
                function printTable(&$tabledata, &$columns, &$actions, $nodata = null, $pre_fn = null) {
                        global $data, $conf, $misc;
-                       global $PHP_SELF;
 
                        if ($tabledata->recordCount() > 0) {
                                
                                                                        } else {
                                                                                echo "<td class=\"opbutton{$id}\">";
                                                                                echo "<a href=\"{$action['url']}";
-                                                                               $misc->printUrlVars($action['vars'], $tabledata->fields);
+                                                                               $misc->printUrlVars($action['vars'], $tabledata->f);
                                                                                echo "\">{$action['title']}</a></td>";
                                                                        }
                                                                }
                                                                break;
                                                        default;
                                                                echo "<td class=\"data{$id}\">";
-                                                               if (array_key_exists($column['field'], $tabledata->fields)) {
+                                                               if (isset($tabledata->f[$column['field']])) {
                                                                        if (isset($column['url'])) {
                                                                                echo "<a href=\"{$column['url']}";
-                                                                               $misc->printUrlVars($column['vars'], $tabledata->fields);
+                                                                               $misc->printUrlVars($column['vars'], $tabledata->f);
                                                                                echo "\">";
                                                                        }
                                                                
                                                                        $type = isset($column['type']) ? $column['type'] : null;
                                                                        $params = isset($column['params']) ? $column['params'] : array();
-                                                                       echo $misc->printVal($tabledata->fields[$column['field']], $type, $params);
+                                                                       echo $misc->printVal($tabledata->f[$column['field']], $type, $params);
                                                                }
                                                                
                                                                if (isset($column['url'])) echo "</a>";
                        
                        if ($treedata->recordCount() > 0) {
                                while (!$treedata->EOF) {
-                                       $rec =& $treedata->fields;
+                                       $rec =& $treedata->f;
                                        
                                        echo "<tree";
                                        echo value_xml_attr('text', $attrs['text'], $rec);
                }
                
                /**
-                * Get information on a server.
+                * Validate and retreive information on a server
                 * If the parameter isn't supplied then the currently
                 * connected server is returned.
                 * @param $server_id A server identifier (host:port)
                 * @return An associative array of server properties
                 */
                function getServerInfo($server_id = null) {
-                       global $conf, $_reload_browser;
+                       global $conf, $_reload_browser, $lang;
 
                        if ($server_id === null && isset($_REQUEST['server']))
                                $server_id = $_REQUEST['server'];
                                        return $info;
                                }
                        }
-                       
-                       return null;
+                       
+                        if ($server_id === null){
+                            return null;
+                        } else {
+                            // Unable to find a matching server, are we being hacked?
+                           echo $lang['strinvalidserverparam'];
+                            exit;
+                        }; 
                }
                
                /**
index 51562fbb83ce7486300abbc39a07daa941819e7e..e1601b0a5f187ffd09411f586d84cdc54e6eb6eb 100644 (file)
@@ -22,7 +22,7 @@
         */
        function doProperties($msg = '') {
                global $data, $misc, $_reload_browser;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if (!isset($_REQUEST['stage'])) $_REQUEST['stage'] = 1;
 
@@ -34,7 +34,7 @@
                                $misc->printTitle($lang['straltercolumn'], 'pg.column.alter'); 
                                $misc->printMsg($msg);
 
-                               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                               echo "<form action=\"colproperties.php\" method=\"post\">\n";
 
                                // Output table header
                                echo "<table>\n";
         */
        function doDefault($msg = '', $isTable = true) {
                global $data, $conf, $misc, $tableName;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                function attPre(&$rowdata) {
                        global $data;
                                        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=\"{$PHP_SELF}?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 */
index 1fd06732fbf54a53329829ed03f0ad60bb746030..554a5c600fd65a3653e8f75aaaf2e4a111e81bd9 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * List constraints on a table
         *
-        * $Id: constraints.php,v 1.43.2.1 2007/05/28 17:21:56 ioguix Exp $
+        * $Id: constraints.php,v 1.43.2.2 2007/07/09 14:55:22 xzilla Exp $
         */
 
        // Include application functions
@@ -16,7 +16,7 @@
         * Confirm and then actually add a FOREIGN KEY constraint
         */
        function addForeignKey($stage, $msg = '') {
-               global $PHP_SELF, $data, $data, $misc;
+               global $data, $data, $misc;
                global $lang;
 
                if (!isset($_POST['name'])) $_POST['name'] = '';
@@ -73,7 +73,7 @@
                                        $buttonRemove->set_attribute('onclick', 'buttonPressed(this);');
                                        $buttonRemove->set_attribute('type', 'button');
 
-                                       echo "<form onsubmit=\"doSelectAll();\" name=\"formIndex\" action=\"$PHP_SELF\" method=\"post\">\n";    
+                                       echo "<form onsubmit=\"doSelectAll();\" name=\"formIndex\" action=\"constraints.php\" method=\"post\">\n";      
 
                                        echo "<table>\n";
                                        echo "<tr><th class=\"data\" colspan=\"3\">{$lang['strfktarget']}</th></tr>";
                                $buttonRemove->set_attribute('onclick', 'buttonPressed(this);');
                                $buttonRemove->set_attribute('type', 'button');
 
-                               echo "<form onsubmit=\"doSelectAll();\" name=\"formIndex\" action=\"$PHP_SELF\" method=\"post\">\n";    
+                               echo "<form onsubmit=\"doSelectAll();\" name=\"formIndex\" action=\"constraints.php\" method=\"post\">\n";      
 
                                echo "<table>\n";
                                echo "<tr><th class=\"data\" colspan=\"3\">{$lang['strname']}</th></tr>\n";
         * Confirm and then actually add a PRIMARY KEY or UNIQUE constraint
         */
        function addPrimaryOrUniqueKey($type, $confirm, $msg = '') {
-               global $PHP_SELF, $data, $data, $misc;
+               global $data, $data, $misc;
                global $lang;
 
                if (!isset($_POST['name'])) $_POST['name'] = '';
                        $buttonRemove->set_attribute('onclick', 'buttonPressed(this);');
                        $buttonRemove->set_attribute('type', 'button');
        
-                       echo "<form onsubmit=\"doSelectAll();\" name=\"formIndex\" action=\"$PHP_SELF\" method=\"post\">\n";    
+                       echo "<form onsubmit=\"doSelectAll();\" name=\"formIndex\" action=\"constraints.php\" method=\"post\">\n";      
        
                        echo "<table>\n";
                        echo "<tr><th class=\"data\" colspan=\"3\">{$lang['strname']}</th></tr>";
         * Confirm and then actually add a CHECK constraint
         */
        function addCheck($confirm, $msg = '') {
-               global $PHP_SELF, $data, $data, $misc;
+               global $data, $data, $misc;
                global $lang;
 
                if (!isset($_POST['name'])) $_POST['name'] = '';
                        $misc->printTitle($lang['straddcheck'],'pg.constraint.check');
                        $misc->printMsg($msg);
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"constraints.php\" method=\"post\">\n";
                        echo "<table>\n";
                        echo "<tr><th class=\"data\">{$lang['strname']}</th>\n";
                        echo "<th class=\"data required\">{$lang['strdefinition']}</th></tr>\n";
         */
        function doDrop($confirm) {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if ($confirm) {
                        $misc->printTrail('constraint');
                        echo "<p>", sprintf($lang['strconfdropconstraint'], $misc->printVal($_REQUEST['constraint']),
                                $misc->printVal($_REQUEST['table'])), "</p>\n";
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"constraints.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
                        echo "<input type=\"hidden\" name=\"table\" value=\"", htmlspecialchars($_REQUEST['table']), "\" />\n";
                        echo "<input type=\"hidden\" name=\"constraint\" value=\"", htmlspecialchars($_REQUEST['constraint']), "\" />\n";
         */
        function doDefault($msg = '') {
                global $data, $misc;
-               global $PHP_SELF;
                global $lang;
 
                function cnPre(&$rowdata) {
                $actions = array(
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "{$PHP_SELF}?action=confirm_drop&amp;{$misc->href}&amp;table=".urlencode($_REQUEST['table'])."&amp;",
+                               'url'   => "constraints.php?action=confirm_drop&amp;{$misc->href}&amp;table=".urlencode($_REQUEST['table'])."&amp;",
                                'vars'  => array('constraint' => 'conname', 'type' => 'contype'),
                        ),
                );
                
                $misc->printTable($constraints, $columns, $actions, $lang['strnoconstraints'], 'cnPre');
                
-               echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?action=add_check&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),
+               echo "<p><a class=\"navlink\" href=\"constraints.php?action=add_check&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),
                        "\">{$lang['straddcheck']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"{$PHP_SELF}?action=add_unique_key&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),
+               echo "<a class=\"navlink\" href=\"constraints.php?action=add_unique_key&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),
                        "\">{$lang['stradduniq']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"{$PHP_SELF}?action=add_primary_key&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),
+               echo "<a class=\"navlink\" href=\"constraints.php?action=add_primary_key&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),
                        "\">{$lang['straddpk']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"{$PHP_SELF}?action=add_foreign_key&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),
+               echo "<a class=\"navlink\" href=\"constraints.php?action=add_foreign_key&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),
                        "\">{$lang['straddfk']}</a></p>\n";
        }
 
index 8d996238e67c01d63005f741fe3024329665dbc1..af61a473b14f7b1c401d4a0654d1b974a85e5329 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage conversions in a database
         *
-        * $Id: conversions.php,v 1.12.2.1 2007/05/28 17:21:56 ioguix Exp $
+        * $Id: conversions.php,v 1.12.2.2 2007/07/09 14:55:22 xzilla Exp $
         */
 
        // Include application functions
@@ -17,7 +17,7 @@
         */
        function doDefault($msg = '') {
                global $data, $conf, $misc, $database;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                $misc->printTrail('schema');
                $misc->printTabs('schema', 'conversions');
index 746b7f9736c6804eb399c3d2704ca634a222363a..5aa9d58da54caacd2cd8be9f10399470159b8c2d 100755 (executable)
@@ -3,7 +3,7 @@
        /**
         * Manage schemas within a database
         *
-        * $Id: database.php,v 1.88.2.2 2007/05/28 17:21:56 ioguix Exp $
+        * $Id: database.php,v 1.88.2.3 2007/07/09 14:55:22 xzilla Exp $
         */
 
        // Include application functions
@@ -33,7 +33,7 @@
         * Searches for a named database object
         */
        function doFind($confirm = true, $msg = '') {
-               global $PHP_SELF, $data, $data, $misc;
+               global $data, $data, $misc;
                global $lang, $conf;
 
                if (!isset($_GET['term'])) $_GET['term'] = '';
@@ -43,7 +43,7 @@
                $misc->printTabs('database','find');
                $misc->printMsg($msg);
                
-               echo "<form action=\"$PHP_SELF\" method=\"get\">\n";
+               echo "<form action=\"database.php\" method=\"get\">\n";
                echo "<p><input name=\"term\" value=\"", htmlspecialchars($_GET['term']), 
                        "\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" />\n";
                // Output list of filters.  This is complex due to all the 'has' and 'conf' feature possibilities
         */
        function doExport($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                $misc->printTrail('database');
                $misc->printTabs('database','export');
         * Show the current status of all database variables
         */
        function doVariables() {
-               global $PHP_SELF, $data, $misc;
+               global $data, $misc;
                global $lang;
 
                // Fetch the variables from the database
         * are running.
         */
        function doProcesses($msg = '') {
-               global $PHP_SELF, $data, $misc;
+               global $data, $misc;
                global $lang;
 
                $misc->printTrail('database');
                        $actions = array(
                                'cancel' => array(
                                        'title' => $lang['strcancel'],
-                                       'url'   => "{$PHP_SELF}?action=signal&amp;signal=CANCEL&amp;{$misc->href}&amp;",
+                                       'url'   => "database.php?action=signal&amp;signal=CANCEL&amp;{$misc->href}&amp;",
                                        'vars'  => array('procpid' => 'procpid')
                                )
                        );
         * Show the existing table locks in the current database
        */
        function doLocks() {
-               global $PHP_SELF, $data, $misc;
+               global $data, $misc;
                global $lang;
 
                // Get the info from the pg_locks view
         * Allow database administration and tuning tasks
         */
        function doAdmin($action = '', $msg = '') {
-               global $PHP_SELF, $data, $misc;
+               global $data, $misc;
                global $lang;           
                switch ($action) {
                        case 'vacuum':                          
                                // Vacuum
                                echo "<tr>\n";
                                echo "<td class=\"data1\" align=\"center\" valign=\"bottom\">\n";
-                               echo "<form name=\"adminfrm\" id=\"adminfrm\" action=\"{$PHP_SELF}\" method=\"post\">\n";
+                               echo "<form name=\"adminfrm\" id=\"adminfrm\" action=\"database.php\" method=\"post\">\n";
                                echo "<input type=\"checkbox\" id=\"vacuum_analyze\" name=\"vacuum_analyze\" /><label for=\"vacuum_analyze\">{$lang['stranalyze']}</label><br />\n";
                                if ($data->hasFullVacuum()) {
                                        echo "<input type=\"checkbox\" id=\"vacuum_full\" name=\"vacuum_full\" /><label for=\"vacuum_full\">{$lang['strfull']}</label><br />\n";                                
 
                                // Analyze
                                echo "<td class=\"data1\" align=\"center\" valign=\"bottom\">\n";
-                               echo "<form name=\"adminfrm\" id=\"adminfrm\" action=\"{$PHP_SELF}\" method=\"post\">\n";
+                               echo "<form name=\"adminfrm\" id=\"adminfrm\" action=\"database.php\" method=\"post\">\n";
                                echo "<input type=\"submit\" value=\"{$lang['stranalyze']}\" />\n";
                                echo "<input type=\"hidden\" name=\"action\" value=\"analyze\" />\n";
                                echo $misc->form;
                                // Recluster
                                if ($data->hasRecluster()){
                                        echo "<td class=\"data1\" align=\"center\" valign=\"bottom\">\n";
-                                       echo "<form name=\"adminfrm\" id=\"adminfrm\" action=\"{$PHP_SELF}\" method=\"post\">\n";
+                                       echo "<form name=\"adminfrm\" id=\"adminfrm\" action=\"database.php\" method=\"post\">\n";
                                        echo "<input type=\"submit\" value=\"{$lang['strclusterindex']}\" />\n";
                                        echo "<input type=\"hidden\" name=\"action\" value=\"recluster\" />\n";
                                        echo $misc->form;
                                
                                // Reindex
                                echo "<td class=\"data1\" align=\"center\" valign=\"bottom\">\n";
-                               echo "<form name=\"adminfrm\" id=\"adminfrm\" action=\"{$PHP_SELF}\" method=\"post\">\n";
+                               echo "<form name=\"adminfrm\" id=\"adminfrm\" action=\"database.php\" method=\"post\">\n";
                                echo "<input type=\"checkbox\" id=\"reindex_force\" name=\"reindex_force\" /><label for=\"reindex_force\">{$lang['strforce']}</label><br />\n";
                                echo "<input type=\"submit\" value=\"{$lang['strreindex']}\" />\n";
                                echo "<input type=\"hidden\" name=\"action\" value=\"reindex\" />\n";
                                        $actions = array(
                                                'edit' => array(
                                                'title' => $lang['stredit'],
-                                               'url'   => "{$PHP_SELF}?action=editautovac&amp;schema=pg_catalog&amp;{$misc->href}&amp;",
+                                               'url'   => "database.php?action=editautovac&amp;schema=pg_catalog&amp;{$misc->href}&amp;",
                                                'vars'  => array('key[vacrelid]' => 'vacrelid')
                                                ),
                                                'delete' => array(
                                                'title' => $lang['strdelete'],
-                                               'url'   => "{$PHP_SELF}?action=delautovac&amp;{$misc->href}&amp;",
+                                               'url'   => "database.php?action=delautovac&amp;{$misc->href}&amp;",
                                                'vars'  => array('key[vacrelid]' => 'vacrelid')
                                                )
                                        );
        function doEditAutovacuum($confirm, $msg = '') {
                global $data, $misc, $conf;
                global $lang;
-               global $PHP_SELF;
 
                $key = $_REQUEST['key'];
 
                        $attrs = $data->getTableAttributes('pg_autovacuum');
                        $rs = $data->browseRow('pg_autovacuum', $key);
                        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\" id=\"ac_form\">\n";
+                       echo "<form action=\"database.php\" method=\"post\" id=\"ac_form\">\n";
                        $elements = 0;
                        $error = true;                  
                        if ($rs->recordCount() == 1 && $attrs->recordCount() > 0) {
         * Delete rows from the autovacuum table
      */
        function doDelAutovacuum($confirm) {
-               global $PHP_SELF, $data, $misc;
+               global $data, $misc;
                global $lang;
 
                if ($confirm) {
 
                        echo "<p>{$lang['strconfdeleterow']}</p>\n";
                        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"database.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"confdelautovac\" />\n";
                        echo $misc->form;
                        echo "<input type=\"hidden\" name=\"table\" value=\"pg_autovacuum\" />\n";
         * Allow execution of arbitrary SQL statements on a database
         */
        function doSQL() {
-               global $PHP_SELF, $data, $misc;
+               global $data, $misc;
                global $lang;
 
                if (!isset($_REQUEST['query'])) $_REQUEST['query'] = '';
        }
 
        function doTree() {
-               global $misc, $data, $lang, $PHP_SELF, $slony;
+               global $misc, $data, $lang, $slony;
 
                $reqvars = $misc->getRequestVars('database');
 
index 5fc001e998b6e5f1ff5620a1b9d723d83871af9b..431f864d7cf65242602497da830b54d3e0d7699a 100644 (file)
@@ -4,7 +4,7 @@
         * Does an export to the screen or as a download.  This checks to
         * see if they have pg_dump set up, and will use it if possible.
         *
-        * $Id: dataexport.php,v 1.23.2.1 2007/05/28 19:30:17 soranzo Exp $
+        * $Id: dataexport.php,v 1.23.2.2 2007/07/09 14:55:22 xzilla Exp $
         */
 
        $extensions = array(
                $misc->printTitle($lang['strexport']);
                if (isset($msg)) $misc->printMsg($msg);
 
-               echo "<form action=\"{$PHP_SELF}\" method=\"post\">\n";
+               echo "<form action=\"dataexport.php\" method=\"post\">\n";
                echo "<table>\n";
                echo "<tr><th class=\"data\">{$lang['strformat']}:</th><td><select name=\"d_format\">\n";
                // COPY and SQL require a table
index a7e3062bb2b274e257f2b51538f5e0131094ddf0..ba4f86cbb24890d7c5b8750e7a689c46982dfb4c 100644 (file)
@@ -9,7 +9,7 @@
         * @param $return_desc The return link name
         * @param $page The current page
         *
-        * $Id: display.php,v 1.55.2.2 2007/05/28 17:21:56 ioguix Exp $
+        * $Id: display.php,v 1.55.2.3 2007/07/09 14:55:22 xzilla Exp $
         */
 
        // Prevent timeouts on large exports (non-safe mode only)
@@ -28,7 +28,6 @@
        function doEditRow($confirm, $msg = '') {
                global $data, $misc, $conf;
                global $lang;
-               global $PHP_SELF;
 
                if (is_array($_REQUEST['key']))
            $key = $_REQUEST['key'];
@@ -61,7 +60,7 @@
                        $attrs = $data->getTableAttributes($_REQUEST['table']);
                        $rs = $data->browseRow($_REQUEST['table'], $key);
                        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\" id=\"ac_form\">\n";
+                       echo "<form action=\"display.php\" method=\"post\" id=\"ac_form\">\n";
                        $elements = 0;
                        $error = true;                  
                        if ($rs->recordCount() == 1 && $attrs->recordCount() > 0) {
        function doDelRow($confirm) {
                global $data, $misc;
                global $lang;
-               global $PHP_SELF;
 
                if ($confirm) {
                        $misc->printTrail($_REQUEST['subject']);
 
                        echo "<p>{$lang['strconfdeleterow']}</p>\n";
                        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"display.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"delrow\" />\n";
                        echo $misc->form;
                        if (isset($_REQUEST['table']))
index f32d613099622cd5a42587c7312780b72488f442..753a8cc03479446d2669658f7f936bdd4c10e9e1 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage domains in a database
         *
-        * $Id: domains.php,v 1.24.2.1 2007/05/28 17:21:56 ioguix Exp $
+        * $Id: domains.php,v 1.24.2.2 2007/07/09 14:55:22 xzilla Exp $
         */
 
        // Include application functions
@@ -31,7 +31,7 @@
         */
        function doAlter($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
        
                $misc->printTrail('domain');
                $misc->printTitle($lang['stralter'],'pg.domain.alter');
@@ -52,7 +52,7 @@
                        }
                        
                        // Display domain info
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"domains.php\" method=\"post\">\n";
                        echo "<table>\n";
                        echo "<tr><th class=\"data left required\" width=\"70\">{$lang['strname']}</th>\n";
                        echo "<td class=\"data1\">", $misc->printVal($domaindata->f['domname']), "</td></tr>\n";
@@ -87,7 +87,7 @@
         * Confirm and then actually add a CHECK constraint
         */
        function addCheck($confirm, $msg = '') {
-               global $PHP_SELF, $data, $data, $misc;
+               global $data, $data, $misc;
                global $lang;
 
                if (!isset($_POST['name'])) $_POST['name'] = '';
@@ -98,7 +98,7 @@
                        $misc->printTitle($lang['straddcheck'],'pg.constraint.check');
                        $misc->printMsg($msg);
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"domains.php\" method=\"post\">\n";
                        echo "<table>\n";
                        echo "<tr><th class=\"data\">{$lang['strname']}</th>\n";
                        echo "<th class=\"data required\">{$lang['strdefinition']}</th></tr>\n";
         */
        function doDropConstraint($confirm, $msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if ($confirm) {
                        $misc->printTrail('domain');
                        
                        echo "<p>", sprintf($lang['strconfdropconstraint'], $misc->printVal($_REQUEST['constraint']), 
                                $misc->printVal($_REQUEST['domain'])), "</p>\n";        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"domains.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop_con\" />\n";
                        echo "<input type=\"hidden\" name=\"domain\" value=\"", htmlspecialchars($_REQUEST['domain']), "\" />\n";
                        echo "<input type=\"hidden\" name=\"constraint\" value=\"", htmlspecialchars($_REQUEST['constraint']), "\" />\n";
         */
        function doProperties($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
        
                $misc->printTrail('domain');
                $misc->printTitle($lang['strproperties'],'pg.domain');
                                                echo $misc->printVal($domaincons->f['consrc']);
                                                echo "</td>";
                                                echo "<td class=\"opbutton{$id}\">";
-                                               echo "<a href=\"$PHP_SELF?action=confirm_drop_con&amp;{$misc->href}&amp;constraint=", urlencode($domaincons->f['conname']),
+                                               echo "<a href=\"domains.php?action=confirm_drop_con&amp;{$misc->href}&amp;constraint=", urlencode($domaincons->f['conname']),
                                                        "&amp;domain=", urlencode($_REQUEST['domain']), "&amp;type=", urlencode($domaincons->f['contype']), "\">{$lang['strdrop']}</a></td></tr>\n";
                
                                                $domaincons->moveNext();
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
                
-               echo "<p><a class=\"navlink\" href=\"$PHP_SELF?{$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=\"{$PHP_SELF}?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=\"$PHP_SELF?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";
         */
        function doDrop($confirm) {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if ($confirm) {
                        $misc->printTrail('domain');
                        $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";
+                       echo "<form action=\"domains.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
                        echo "<input type=\"hidden\" name=\"domain\" value=\"", htmlspecialchars($_REQUEST['domain']), "\" />\n";
                        echo $misc->form;
         */
        function doCreate($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                if (!isset($_POST['domname'])) $_POST['domname'] = '';
                if (!isset($_POST['domtype'])) $_POST['domtype'] = '';
                $misc->printTitle($lang['strcreatedomain'],'pg.domain.create');
                $misc->printMsg($msg);
 
-               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+               echo "<form action=\"domains.php\" method=\"post\">\n";
                echo "<table>\n";
                echo "<tr><th class=\"data left required\" width=\"70\">{$lang['strname']}</th>\n";
                echo "<td class=\"data1\"><input name=\"domname\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"", 
         */
        function doDefault($msg = '') {
                global $data, $conf, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $misc->printTrail('schema');
                $misc->printTabs('schema','domains');
                $actions = array(
                        'properties' => array(
                                'title' => $lang['strproperties'],
-                               'url'   => "{$PHP_SELF}?action=properties&amp;{$misc->href}&amp;",
+                               'url'   => "domains.php?action=properties&amp;{$misc->href}&amp;",
                                'vars'  => array('domain' => 'domname'),
                        ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "{$PHP_SELF}?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=\"{$PHP_SELF}?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";
 
        }
        
         * Generate XML for the browser tree.
         */
        function doTree() {
-               global $misc, $data, $PHP_SELF;
+               global $misc, $data;
                
                $domains = $data->getDomains();
                
index d4dee9e7e54b394dad40285e24d4b968a33b5bf6..6347cd72d2916378187e313243be7dad7f2c8223 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage functions in a database
         *
-        * $Id: functions.php,v 1.56.2.1 2007/05/28 17:21:56 ioguix Exp $
+        * $Id: functions.php,v 1.56.2.2 2007/07/09 14:55:22 xzilla Exp $
         */
 
        // Include application functions
@@ -44,7 +44,7 @@
         */
        function doEdit($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $misc->printTrail('function');
                $misc->printTitle($lang['stralter'],'pg.function.alter');
@@ -83,7 +83,7 @@
                        }
 
                        $func_full = $fndata->f['proname'] . "(". $fndata->f['proarguments'] .")";
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"functions.php\" method=\"post\">\n";
                        echo "<table width=\"90%\">\n";
                        echo "<tr>\n";
                        echo "<th class=\"data required\">{$lang['strfunction']}</th>\n";
         */
        function doProperties($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $misc->printTrail('function');
                $misc->printTitle($lang['strproperties'],'pg.function');
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
                
-               echo "<p><a class=\"navlink\" href=\"$PHP_SELF?{$misc->href}\">{$lang['strshowallfunctions']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"$PHP_SELF?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=\"$PHP_SELF?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";
        }
        
         */
        function doDrop($confirm) {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if ($confirm) {
                        $misc->printTrail('schema');
                        
                        echo "<p>", sprintf($lang['strconfdropfunction'], $misc->printVal($_REQUEST['function'])), "</p>\n";    
                        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"functions.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
                        echo "<input type=\"hidden\" name=\"function\" value=\"", htmlspecialchars($_REQUEST['function']), "\" />\n";
                        echo "<input type=\"hidden\" name=\"function_oid\" value=\"", htmlspecialchars($_REQUEST['function_oid']), "\" />\n";
         */
        function doCreate($msg = '',$szJS="") {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $misc->printTrail('schema');
                if (!isset($_POST['formFunction'])) $_POST['formFunction'] = '';
                        var g_lang_strarglower = \"". addslashes($lang["strarglower"]) ."\";
                </script>
                ";
-               echo "<form action=\"$PHP_SELF\" method=post><input type=\"hidden\" name=\"formEmptyArgs\" id=\"formEmptyArgs\" value=\"1\" />\n";
+               echo "<form action=\"functions.php\" method=post><input type=\"hidden\" name=\"formEmptyArgs\" id=\"formEmptyArgs\" value=\"1\" />\n";
                echo "<table><tbody id=\"args_table\">\n";
                echo "<tr><th class=\"data required\">{$lang['strname']}</th>\n";
                echo "<th class=\"data required\" colspan=\"2\">{$lang['strreturns']}</th>\n";
         */
        function doDefault($msg = '') {
                global $data, $conf, $misc, $func;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $misc->printTrail('schema');
                $misc->printTabs('schema','functions');
                        ),
                        'alter' => array(
                                'title' => $lang['stralter'],
-                               'url'   => "{$PHP_SELF}?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'   => "{$PHP_SELF}?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(
                
                $misc->printTable($funcs, $columns, $actions, $lang['strnofunctions']);
 
-               echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?action=create&amp;{$misc->href}\">{$lang['strcreateplfunction']}</a> | ";
-               echo "<a class=\"navlink\" href=\"{$PHP_SELF}?action=create&amp;language=internal&amp;{$misc->href}\">{$lang['strcreateinternalfunction']}</a> | ";
-               echo "<a class=\"navlink\" href=\"{$PHP_SELF}?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";
        }
        
        /**
index c062f86f1719fa9d159ceba3bc79fcca235ebed2..5028233f9cfa08b81b366a83a259beeef76682d4 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage groups in a database cluster
         *
-        * $Id: groups.php,v 1.21.4.1 2007/05/28 17:21:56 ioguix Exp $
+        * $Id: groups.php,v 1.21.4.2 2007/07/09 14:55:22 xzilla Exp $
         */
 
        // Include application functions
@@ -17,7 +17,7 @@
         */
        function doAddMember() {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                $status = $data->addGroupMember($_REQUEST['group'], $_REQUEST['user']);
                if ($status == 0)
@@ -31,7 +31,7 @@
         */
        function doDropMember($confirm) {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if ($confirm) { 
                        $misc->printTrail('group');
@@ -39,7 +39,7 @@
                        
                        echo "<p>", sprintf($lang['strconfdropmember'], $misc->printVal($_REQUEST['user']), $misc->printVal($_REQUEST['group'])), "</p>\n";
                        
-                       echo "<form action=\"{$PHP_SELF}\" method=\"post\">\n";
+                       echo "<form action=\"groups.php\" method=\"post\">\n";
                        echo $misc->form;
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop_member\" />\n";
                        echo "<input type=\"hidden\" name=\"group\" value=\"", htmlspecialchars($_REQUEST['group']), "\" />\n";
@@ -62,7 +62,7 @@
         */
        function doProperties($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
        
                if (!isset($_POST['user'])) $_POST['user'] = '';
        
@@ -80,7 +80,7 @@
                while (!$groupdata->EOF) {
                                        $id = (($i % 2) == 0 ? '1' : '2');
                echo "<tr><td class=\"data{$id}\">", $misc->printVal($groupdata->f['usename']), "</td>\n";
-                                       echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?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->f['usename']), "\">{$lang['strdrop']}</a></td>\n";
                echo "</tr>\n";
                $groupdata->moveNext();
@@ -90,7 +90,7 @@
                else echo "<p>{$lang['strnousers']}</p>\n";
 
                // Display form for adding a user to the group                  
-               echo "<form action=\"{$PHP_SELF}\" method=\"post\">\n";
+               echo "<form action=\"groups.php\" method=\"post\">\n";
                echo "<select name=\"user\">";
                while (!$users->EOF) {
                        $uname = $misc->printVal($users->f['usename']);
                echo "<input type=\"hidden\" name=\"action\" value=\"add_member\" />\n";
                echo "</form>\n";
                
-               echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?{$misc->href}\">{$lang['strshowallgroups']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"groups.php?{$misc->href}\">{$lang['strshowallgroups']}</a></p>\n";
        }
        
        /**
         */
        function doDrop($confirm) {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if ($confirm) {
                        $misc->printTrail('group');
                        
                        echo "<p>", sprintf($lang['strconfdropgroup'], $misc->printVal($_REQUEST['group'])), "</p>\n";
                        
-                       echo "<form action=\"{$PHP_SELF}\" method=\"post\">\n";
+                       echo "<form action=\"groups.php\" method=\"post\">\n";
                        echo $misc->form;
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
                        echo "<input type=\"hidden\" name=\"group\" value=\"", htmlspecialchars($_REQUEST['group']), "\" />\n";
         */
        function doCreate($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                if (!isset($_POST['name'])) $_POST['name'] = '';
                if (!isset($_POST['members'])) $_POST['members'] = array();
                $misc->printTitle($lang['strcreategroup'],'pg.group.create');
                $misc->printMsg($msg);
 
-               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+               echo "<form action=\"\" method=\"post\">\n";
                echo $misc->form;
                echo "<table>\n";
                echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strname']}</th>\n";
         */
        function doDefault($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $misc->printTrail('server');
                $misc->printTabs('server','groups');
                $actions = array(
                        'properties' => array(
                                'title' => $lang['strproperties'],
-                               'url'   => "{$PHP_SELF}?action=properties&amp;{$misc->href}&amp;",
+                               'url'   => "groups.php?action=properties&amp;{$misc->href}&amp;",
                                'vars'  => array('group' => 'groname'),
                        ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "{$PHP_SELF}?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=\"{$PHP_SELF}?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";
 
        }
 
index 7571b3bf8cfabc7418a55b15bd4c6cf845fa26a3..b3bfec364e2a27871ae2f70e4564bfb3c0cd4ee9 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * List indexes on a table
         *
-        * $Id: indexes.php,v 1.38.2.1 2007/05/28 17:21:56 ioguix Exp $
+        * $Id: indexes.php,v 1.38.2.2 2007/07/09 14:55:22 xzilla Exp $
         */
 
        // Include application functions
@@ -17,7 +17,7 @@
         */
        function doClusterIndex($confirm) {
                global $data, $misc, $action;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if ($confirm) {
                        // Default analyze to on
@@ -28,7 +28,7 @@
 
                        echo "<p>", sprintf($lang['strconfcluster'], $misc->printVal($_REQUEST['index'])), "</p>\n";
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"indexes.php\" method=\"post\">\n";
                        echo "<p><input type=\"checkbox\" id=\"analyze\" name=\"analyze\"", (isset($_REQUEST['analyze']) ? ' checked="checked"' : ''), " /><label for=\"analyze\">{$lang['stranalyze']}</label></p>\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"cluster_index\" />\n";
                        echo "<input type=\"hidden\" name=\"table\" value=\"", htmlspecialchars($_REQUEST['table']), "\" />\n";
@@ -70,7 +70,7 @@
         */
        function doCreateIndex($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if (!isset($_POST['formIndexName'])) $_POST['formIndexName'] = '';
                if (!isset($_POST['formIndexType'])) $_POST['formIndexType'] = null;
                $buttonRemove->set_attribute("onclick", "buttonPressed(this);");                
                $buttonRemove->set_attribute("type", "button");
 
-               echo "<form onsubmit=\"doSelectAll();\" name=\"formIndex\" action=\"$PHP_SELF\" method=\"post\">\n";
+               echo "<form onsubmit=\"doSelectAll();\" name=\"formIndex\" action=\"indexes.php\" method=\"post\">\n";
 
 
                echo "<table>\n";
         */
        function doDropIndex($confirm) {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if ($confirm) {
                        $misc->printTrail('index');
 
                        echo "<p>", sprintf($lang['strconfdropindex'], $misc->printVal($_REQUEST['index'])), "</p>\n";
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"indexes.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop_index\" />\n";
                        echo "<input type=\"hidden\" name=\"table\" value=\"", htmlspecialchars($_REQUEST['table']), "\" />\n";
                        echo "<input type=\"hidden\" name=\"index\" value=\"", htmlspecialchars($_REQUEST['index']), "\" />\n";
 
        function doDefault($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                function indPre(&$rowdata, $actions) {
                        global $data, $lang;
                $actions = array(
                        'cluster' => array(
                                'title' => $lang['strclusterindex'],
-                               'url'   => "{$PHP_SELF}?action=confirm_cluster_index&amp;{$misc->href}&amp;table=".urlencode($_REQUEST['table'])."&amp;",
+                               'url'   => "indexes.php?action=confirm_cluster_index&amp;{$misc->href}&amp;table=".urlencode($_REQUEST['table'])."&amp;",
                                'vars'  => array('index' => 'indname'),
                        ),
                        'reindex' => array(
                                'title' => $lang['strreindex'],
-                               'url'   => "{$PHP_SELF}?action=reindex&amp;{$misc->href}&amp;table=".urlencode($_REQUEST['table'])."&amp;",
+                               'url'   => "indexes.php?action=reindex&amp;{$misc->href}&amp;table=".urlencode($_REQUEST['table'])."&amp;",
                                'vars'  => array('index' => 'indname'),
                        ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "{$PHP_SELF}?action=confirm_drop_index&amp;{$misc->href}&amp;table=".urlencode($_REQUEST['table'])."&amp;",
+                               'url'   => "indexes.php?action=confirm_drop_index&amp;{$misc->href}&amp;table=".urlencode($_REQUEST['table'])."&amp;",
                                'vars'  => array('index' => 'indname'),
                        ),
                );
                
                $misc->printTable($indexes, $columns, $actions, $lang['strnoindexes'], 'indPre');
                
-               echo "<p><a class=\"navlink\" href=\"$PHP_SELF?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";            
        }
 
        $misc->printHeader($lang['strindexes'], "<script src=\"indexes.js\" type=\"text/javascript\"></script>");
index b462bb00f673b66c9383d576217847705cd9a2ed..74761065d524d4eca4e2113afd9cf48d8bffc124 100755 (executable)
--- a/intro.php
+++ b/intro.php
@@ -3,7 +3,7 @@
        /**
         * Intro screen
         *
-        * $Id: intro.php,v 1.15.6.1 2007/05/28 19:30:17 soranzo Exp $
+        * $Id: intro.php,v 1.15.6.2 2007/07/09 14:55:22 xzilla Exp $
         */
 
        // Include application functions (no db conn)
@@ -19,7 +19,7 @@
 
 <h1><?php echo "$appName $appVersion (PHP ". phpversion() .')' ?></h1>
 
-<form method="get" action="<?php echo $PHP_SELF; ?>">
+<form method="get" action="intro.php">
  <label>
   <select name="language" onchange="this.form.submit()">
 <?php
index 762db990de84ec4216517278b22b5b023ae71227..f79bb046f164fb621dcefdf6044bd6ecb554082f 100755 (executable)
@@ -4,7 +4,7 @@
         * English language file for phpPgAdmin.  Use this as a basis
         * for new translations.
         *
-        * $Id: english.php,v 1.198.2.2 2007/01/21 21:25:24 xzilla Exp $
+        * $Id: english.php,v 1.198.2.3 2007/07/09 14:55:23 xzilla Exp $
         */
 
        // Language and character set
        $lang['strimporterrorline-badcolumnnum'] = 'Import error on line %s:  Line does not possess the correct number of columns.';
        $lang['strimporterror-uploadedfile'] = 'Import error: File could not be uploaded to the server';
        $lang['strcannotdumponwindows'] = 'Dumping of complex table and schema names on Windows is not supported.';
+       $lang['strinvalidserverparam'] = 'Attempt to connect with invalid server parameter, possibly someone is trying to hack your system.'; 
 
        // Tables
        $lang['strtable'] = 'Table';
index a8b791755b5f527f579a0cd78be7c8f6c8fce2ae..58e562dd2cadc76ebccb9a8aa550d47c74a3cc02 100644 (file)
@@ -4,7 +4,7 @@
      * French Language file for phpPgAdmin. 
      * @maintainer Pascal PEYRE [[email protected]]
      *
-     * $Id: french.php,v 1.19.2.1 2007/01/20 18:35:43 xzilla Exp $
+     * $Id: french.php,v 1.19.2.2 2007/07/09 14:55:23 xzilla Exp $
      */
 
     // Language and character set
     $lang['strimporterrorline-badcolumnnum']  =  'Erreur d\'importation sur la ligne %s : la ligne ne possède pas le bon nombre de colonnes.';
     $lang['strimporterror-uploadedfile']  =  'Erreur d\'importation : le fichier n\'a pas pû Ãªtre récupéré sur le serveur.';
     $lang['strcannotdumponwindows']  =  'La sauvegarde de table complexe et des noms de schémas n\'est pas supporté sur Windows.';
+       $lang['strinvalidserverparam'] = 'Tentative de connexion avec un server invalide, il est possible que quelqu\'un essai de pirater votre système.'; 
 
     // Tables
     $lang['strtable'] = 'Table';
index bb64aa02684ffcf5a1b54d19c88cab049c94b591..d07ebc3146aff8449b90c4158a785f72bc31f1c7 100644 (file)
@@ -4,7 +4,7 @@
         * English language file for phpPgAdmin.  Use this as a basis
         * for new translations.
         *
-        * $Id: english.php,v 1.151.2.2 2007/01/21 21:25:24 xzilla Exp $
+        * $Id: english.php,v 1.151.2.3 2007/07/09 14:55:23 xzilla Exp $
         */
 
        // Language and character set
        $lang['strimporterrorline-badcolumnnum'] = 'Import error on line %s:  Line does not possess the correct number of columns.';
        $lang['strimporterror-uploadedfile'] = 'Import error: File could not be uploaded to the server';
        $lang['strcannotdumponwindows'] = 'Dumping of complex table and schema names on Windows is not supported.';
+       $lang['strinvalidserverparam'] = 'Attempt to connect with invalid server parameter, possibly someone is trying to hack your system.'; 
 
        // Tables
        $lang['strtable'] = 'Table';
index ae68b6faaba5682dad90e4015f574c00218e7835..0dd33e781eb76066a246176e36bc9e64ad078a1c 100644 (file)
@@ -4,7 +4,7 @@
      * French Language file for phpPgAdmin. 
      * @maintainer Pascal PEYRE [[email protected]]
      *
-     * $Id: french.php,v 1.18.2.1 2007/01/20 18:35:43 xzilla Exp $
+     * $Id: french.php,v 1.18.2.2 2007/07/09 14:55:23 xzilla Exp $
      */
 
     // Language and character set
     $lang['strimporterrorline-badcolumnnum']  =  'Erreur d\'importation sur la ligne %s : la ligne ne poss&#232;de pas le bon nombre de colonnes.';
     $lang['strimporterror-uploadedfile']  =  'Erreur d\'importation : le fichier n\'a pas p&#251; &#234;tre r&#233;cup&#233;r&#233; sur le serveur.';
     $lang['strcannotdumponwindows']  =  'La sauvegarde de table complexe et des noms de sch&#233;mas n\'est pas support&#233; sur Windows.';
+       $lang['strinvalidserverparam'] = 'Tentative de connexion avec un server invalide, il est possible que quelqu\'un essai de pirater votre syst&#232;me.'; 
 
     // Tables
     $lang['strtable'] = 'Table';
index 54bc10a14d499e6da875b07326d7fd78447bba44..51a6cf7bf2f25eb02d91eceadf12709a8ac0c713 100644 (file)
@@ -4,7 +4,7 @@
         * Spanish language file for phpPgAdmin.
         * @maintainer Mart&#237;n Marqu&#233;s ([email protected])
         *
-        * $Id: spanish.php,v 1.36.2.2 2007/01/21 21:25:24 xzilla Exp $
+        * $Id: spanish.php,v 1.36.2.3 2007/07/09 14:55:23 xzilla Exp $
         */
 
        // Language and character set
@@ -168,6 +168,7 @@ $lang['strac']  =  'Enable AutoComplete';
     $lang['strimporterrorline-badcolumnnum']  =  'Error de importaci&#243;n en la l&#237;nea %s:  La l&#237;nea no posee la cantidad de columnas correctas.';
     $lang['strimporterror-uploadedfile']  =  'Error de importaci&#243;n: No se ha podido subir el archivo al servidor';
     $lang['strcannotdumponwindows']  =  'Vuelco de datos con nombres complejos de tablas y esquemas no esta soportado en Windows.';
+       $lang['strinvalidserverparam'] = 'Tentativa de conectar con par&#225;metro inv&#225;lido del servidor. &#191;Alguien est&#225; intentando posiblemente cortar tu sistema?'; 
 
        // Tables
        $lang['strtable'] = 'Tabla';
index 14c8d0b37d70d0d79b70f082d45bcabda015d6e7..642f07fb62b8e1bd392483f9f46d56349583453b 100644 (file)
@@ -4,7 +4,7 @@
         * Spanish language file for phpPgAdmin.
         * @maintainer Martín Marqués ([email protected])
         *
-        * $Id: spanish.php,v 1.35.2.2 2007/01/21 21:25:24 xzilla Exp $
+        * $Id: spanish.php,v 1.35.2.3 2007/07/09 14:55:23 xzilla Exp $
         */
 
        // Language and character set
@@ -168,6 +168,7 @@ $lang['strac']  =  'Enable AutoComplete';
     $lang['strimporterrorline-badcolumnnum']  =  'Error de importación en la línea %s:  La línea no posee la cantidad de columnas correctas.';
     $lang['strimporterror-uploadedfile']  =  'Error de importación: No se ha podido subir el archivo al servidor';
     $lang['strcannotdumponwindows']  =  'Vuelco de datos con nombres complejos de tablas y esquemas no esta soportado en Windows.';
+       $lang['strinvalidserverparam'] = 'Tentativa de conectar con parámetro inválido del servidor. Â¿Alguien está intentando posiblemente cortar tu sistema?'; 
 
        // Tables
        $lang['strtable'] = 'Tabla';
index 5908b4f7015bf05a87fc2c6bd8cee89694680e4c..5d908e43466e604af09535a832b8e2b1d2897f9d 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage languages in a database
         *
-        * $Id: languages.php,v 1.10.2.1 2007/05/28 17:21:56 ioguix Exp $
+        * $Id: languages.php,v 1.10.2.2 2007/07/09 14:55:22 xzilla Exp $
         */
 
        // Include application functions
@@ -17,7 +17,7 @@
         */
        function doDefault($msg = '') {
                global $data, $misc, $database;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $misc->printTrail('database');
                $misc->printTabs('database','languages');
index 93a938a530ac672117bcb3e45d8f3627dee6a3d6..08c383b98d23821cffb74ca56c289b2d9c08230f 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Function library read in upon startup
         *
-        * $Id: lib.inc.php,v 1.111.2.5 2007/06/01 12:34:16 xzilla Exp $
+        * $Id: lib.inc.php,v 1.111.2.6 2007/07/09 14:55:23 xzilla Exp $
         */
 
        include_once('./libraries/decorator.inc.php');
@@ -16,7 +16,7 @@
        $appName = 'phpPgAdmin';
 
        // Application version
-       $appVersion = '4.1.2';
+       $appVersion = '4.1.3-rc-1';
 
        // PostgreSQL and PHP minimum version
        $postgresqlMinVer = '7.0';
                }
        }
 
-       // Prevent XSS attacks
-    $PHP_SELF = htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, $lang['appcharset']);
-
 ?>
index 3720eb438f6961fc6223592957124b905c44a82f..9ec2dc862e049049593ed6c27e778fc3a55f9b3e 100755 (executable)
--- a/login.php
+++ b/login.php
@@ -3,7 +3,7 @@
        /**
         * Login screen
         *
-        * $Id: login.php,v 1.32.2.1 2007/05/28 17:21:56 ioguix Exp $
+        * $Id: login.php,v 1.32.2.2 2007/07/09 14:55:22 xzilla Exp $
         */
        global $conf;
        
@@ -11,8 +11,6 @@
        // Check to see if the configuration file exists, if not, explain
        require_once('./libraries/lib.inc.php');
 
-       global $PHP_SELF;
-
        $misc->printHeader($lang['strlogin']);
        $misc->printBody();
        $misc->printTrail('root');
@@ -24,7 +22,7 @@
        if (isset($msg)) $misc->printMsg($msg);
 ?>
 
-<form action="<?php echo $PHP_SELF ?>" method="post" name="login_form">
+<form action="" method="post" name="login_form">
 <?php
        if (!empty($_POST)) $vars =& $_POST;
        else $vars =& $_GET;
index 6cf140e1b3130a26954f817419fd42c21a13640f..10efaea80e85ed965e40e66b593f0d21b79ff6fc 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage operators in a database
         *
-        * $Id: operators.php,v 1.22.2.1 2007/05/28 17:21:56 ioguix Exp $
+        * $Id: operators.php,v 1.22.2.2 2007/07/09 14:55:22 xzilla Exp $
         */
 
        // Include application functions
@@ -17,7 +17,7 @@
         */
        function doProperties($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                $misc->printTrail('operator');
                $misc->printTitle($lang['strproperties'],'pg.operator');
@@ -56,7 +56,7 @@
                        echo "<td class=\"data1\">", $misc->printVal($oprdata->f['oprgtcmpop']), "</td></tr>\n";
                        echo "</table>\n";
 
-                       echo "<p><a class=\"navlink\" href=\"$PHP_SELF?{$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']);
@@ -67,7 +67,7 @@
         */
        function doDrop($confirm) {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if ($confirm) {
                        $misc->printTrail('operator');
@@ -75,7 +75,7 @@
                        
                        echo "<p>", sprintf($lang['strconfdropoperator'], $misc->printVal($_REQUEST['operator'])), "</p>\n";    
                        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"operators.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
                        echo "<input type=\"hidden\" name=\"operator\" value=\"", htmlspecialchars($_REQUEST['operator']), "\" />\n";
                        echo "<input type=\"hidden\" name=\"operator_oid\" value=\"", htmlspecialchars($_REQUEST['operator_oid']), "\" />\n";
         */
        function doDefault($msg = '') {
                global $data, $conf, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $misc->printTrail('schema');
                $misc->printTabs('schema','operators');
                $actions = array(
                        'properties' => array(
                                'title' => $lang['strproperties'],
-                               'url'   => "{$PHP_SELF}?action=properties&amp;{$misc->href}&amp;",
+                               'url'   => "operators.php?action=properties&amp;{$misc->href}&amp;",
                                'vars'  => array('operator' => 'oprname', 'operator_oid' => 'oid'),
                        ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "{$PHP_SELF}?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=\"$PHP_SELF?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";
        }
 
        /**
         * Generate XML for the browser tree.
         */
        function doTree() {
-               global $misc, $data, $PHP_SELF;
+               global $misc, $data;
                
                $operators = $data->getOperators();
                
index b5dc0b54cff380c908caacfb29d1c82cbd66e5cc..b988e007d22b66da7b3ec1042a0fbe0dc883282a 100755 (executable)
@@ -3,7 +3,7 @@
        /**
         * Slony database tab plugin
         *
-        * $Id: plugin_slony.php,v 1.12.2.1 2007/05/28 17:21:56 ioguix Exp $
+        * $Id: plugin_slony.php,v 1.12.2.2 2007/07/09 14:55:22 xzilla Exp $
         */
 
        // Include application functions
@@ -31,7 +31,7 @@
         * @param string $subject The tree node to return
         */
        function doTree($subject) {
-               global $misc, $data, $lang, $PHP_SELF, $slony;
+               global $misc, $data, $lang, $slony;
 
                $reqvars = $misc->getRequestVars('database');
                if (isset($slony))
         * Display the slony clusters (we only support one)
         */      
        function doClusters($msg = '') {
-               global $PHP_SELF, $slony, $misc;
+               global $slony, $misc;
                global $lang;
 
                $misc->printTrail('database');
                $misc->printTable($clusters, $columns, $actions, $lang['strnoclusters']);
 
                if ($clusters->recordCount() == 0) {            
-                       echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?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";
                }
        }
 
         * Display the properties of a slony cluster
         */      
        function doCluster($msg = '') {
-               global $data, $slony, $misc, $PHP_SELF;
+               global $data, $slony, $misc;
                global $lang;
                
                $misc->printTrail('slony_cluster');
         */
        function doCreateCluster($confirm, $msg = '') {
                global $data, $slony, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                if ($confirm) {
                        if (!isset($_POST['cluster'])) $_POST['cluster'] = '';
                        $misc->printTitle($lang['strinitcluster']);
                        $misc->printMsg($msg);
        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
                        echo $misc->form;
                        echo "<table width=\"100%\">\n";
                        echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strcluster']}</th>\n";
         */
        function doDropCluster($confirm) {
                global $slony, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if ($confirm) {
                        $misc->printTrail('slony_cluster');
 
                        echo "<p>", sprintf($lang['strconfdropcluster'], $misc->printVal($slony->slony_cluster)), "</p>\n";
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop_cluster\" />\n";
                        echo $misc->form;
                        echo "<input type=\"submit\" name=\"drop\" value=\"{$lang['strdrop']}\" />\n";
         * List all the nodes
         */
        function doNodes($msg = '') {
-               global $PHP_SELF, $slony, $misc;
+               global $slony, $misc;
                global $lang;
 
                $misc->printTrail('slony_cluster');
                
                $misc->printTable($nodes, $columns, $actions, $lang['strnonodes']);
                
-               echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?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";
        }
        
        /**
         * Display the properties of a node
         */      
        function doNode($msg = '') {
-               global $data, $slony, $misc, $PHP_SELF;
+               global $data, $slony, $misc;
                global $lang;
                
                $misc->printTrail('slony_node');
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
 
-               echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?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";
        }
 
        /**
         */
        function doCreateNode($confirm, $msg = '') {
                global $slony, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                if ($confirm) {
                        if (!isset($_POST['nodeid'])) $_POST['nodeid'] = '';
                        $misc->printTitle($lang['strcreatenode']);
                        $misc->printMsg($msg);
        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
                        echo $misc->form;
                        echo "<table width=\"100%\">\n";
                        echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strid']}</th>\n";
         */
        function doDropNode($confirm) {
                global $slony, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if ($confirm) {
                        $misc->printTrail('slony_cluster');
 
                        echo "<p>", sprintf($lang['strconfdropnode'], $misc->printVal($_REQUEST['no_id'])), "</p>\n";
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop_node\" />\n";
                        echo "<input type=\"hidden\" name=\"no_id\" value=\"", htmlspecialchars($_REQUEST['no_id']), "\" />\n";
                        echo $misc->form;
         * List all the paths
         */
        function doPaths($msg = '') {
-               global $PHP_SELF, $slony, $misc;
+               global $slony, $misc;
                global $lang;
 
                $misc->printTrail('database');
                
                $misc->printTable($paths, $columns, $actions, $lang['strnopaths']);
        
-               echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?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";
        }
        
        /**
         * Display the properties of a path
         */      
        function doPath($msg = '') {
-               global $data, $slony, $misc, $PHP_SELF;
+               global $data, $slony, $misc;
                global $lang;
                
                $misc->printTrail('slony_path');
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
 
-               echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?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";
        }
 
        /**
         */
        function doCreatePath($confirm, $msg = '') {
                global $data, $slony, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                if ($confirm) {
                        if (!isset($_POST['pathserver'])) $_POST['pathserver'] = '';
                        $misc->printTitle($lang['strcreatepath']);
                        $misc->printMsg($msg);
        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
                        echo $misc->form;
                        echo "<table width=\"100%\">\n";
                        echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strnodename']}</th>\n";
         */
        function doDropPath($confirm) {
                global $slony, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if ($confirm) {
                        $misc->printTrail('slony_cluster');
 
                        echo "<p>", sprintf($lang['strconfdroppath'], $misc->printVal($_REQUEST['path_id'])), "</p>\n";
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop_path\" />\n";
                        echo "<input type=\"hidden\" name=\"no_id\" value=\"", htmlspecialchars($_REQUEST['no_id']), "\" />\n";
                        echo "<input type=\"hidden\" name=\"path_id\" value=\"", htmlspecialchars($_REQUEST['path_id']), "\" />\n";
         * List all the listens
         */
        function doListens($msg = '') {
-               global $PHP_SELF, $slony, $misc;
+               global $slony, $misc;
                global $lang;
 
                $misc->printTrail('database');
                
                $misc->printTable($listens, $columns, $actions, $lang['strnolistens']);
 
-               echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?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";
        }
 
        /**
         * Display the properties of a listen
         */      
        function doListen($msg = '') {
-               global $data, $slony, $misc, $PHP_SELF;
+               global $data, $slony, $misc;
                global $lang;
                
                $misc->printTrail('slony_path');
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
 
-               echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?action=confirm_drop_listen&amp;{$misc->href}&amp;no_id={$_REQUEST['no_id']}&amp;listen_id={$_REQUEST['listen_id']}&amp;origin_id={$listen->f['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->f['li_origin']}\">{$lang['strdrop']}</a></p>\n";
        }
 
        /**
         */
        function doCreateListen($confirm, $msg = '') {
                global $data, $slony, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                if ($confirm) {
                        if (!isset($_POST['listenorigin'])) $_POST['listenorigin'] = '';
                        $misc->printTitle($lang['strcreatelisten']);
                        $misc->printMsg($msg);
        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
                        echo $misc->form;
                        echo "<table width=\"100%\">\n";
                        echo "\t<tr>\n\t\t<th class=\"data left required\">Origin</th>\n";
         */
        function doDropListen($confirm) {
                global $slony, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if ($confirm) {
                        $misc->printTrail('slony_cluster');
 
                        echo "<p>", sprintf($lang['strconfdroplisten'], $misc->printVal($_REQUEST['listen_id'])), "</p>\n";
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop_listen\" />\n";
                        echo "<input type=\"hidden\" name=\"no_id\" value=\"", htmlspecialchars($_REQUEST['no_id']), "\" />\n";
                        echo "<input type=\"hidden\" name=\"listen_id\" value=\"", htmlspecialchars($_REQUEST['listen_id']), "\" />\n";
         * List all the replication sets
         */
        function doReplicationSets($msg = '') {
-               global $PHP_SELF, $slony, $misc;
+               global $slony, $misc;
                global $lang;
 
                $misc->printTrail('slony_cluster');
                
                $misc->printTable($sets, $columns, $actions, $lang['strnorepsets']);
                
-               echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?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";
        }       
 
        /**
         * Display the properties of a replication set
         */      
        function doReplicationSet($msg = '') {
-               global $data, $slony, $misc, $PHP_SELF;
+               global $data, $slony, $misc;
                global $lang;
                
                $misc->printTrail('slony_set');
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
 
-               echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?action=confirm_drop_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strdrop']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"{$PHP_SELF}?action=confirm_lock_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strlock']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"{$PHP_SELF}?action=confirm_unlock_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strunlock']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"{$PHP_SELF}?action=merge_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strmerge']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"{$PHP_SELF}?action=move_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strmove']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"{$PHP_SELF}?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";
        }
 
        /**
         */
        function doCreateReplicationSet($confirm, $msg = '') {
                global $slony, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                if ($confirm) {
                        if (!isset($_POST['setid'])) $_POST['setid'] = '';
                        $misc->printTitle($lang['strcreaterepset']);
                        $misc->printMsg($msg);
        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
                        echo $misc->form;
                        echo "<table width=\"100%\">\n";
                        echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strid']}</th>\n";
         */
        function doDropReplicationSet($confirm) {
                global $slony, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if ($confirm) {
                        $misc->printTrail('slony_cluster');
 
                        echo "<p>", sprintf($lang['strconfdroprepset'], $misc->printVal($_REQUEST['set_id'])), "</p>\n";
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop_set\" />\n";
                        echo "<input type=\"hidden\" name=\"set_id\" value=\"", htmlspecialchars($_REQUEST['set_id']), "\" />\n";
                        echo $misc->form;
         */
        function doLockReplicationSet($confirm) {
                global $slony, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if ($confirm) {
                        $misc->printTrail('slony_cluster');
 
                        echo "<p>", sprintf($lang['strconflockrepset'], $misc->printVal($_REQUEST['set_id'])), "</p>\n";
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"lock_set\" />\n";
                        echo "<input type=\"hidden\" name=\"set_id\" value=\"", htmlspecialchars($_REQUEST['set_id']), "\" />\n";
                        echo $misc->form;
         */
        function doUnlockReplicationSet($confirm) {
                global $slony, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if ($confirm) {
                        $misc->printTrail('slony_cluster');
 
                        echo "<p>", sprintf($lang['strconfunlockrepset'], $misc->printVal($_REQUEST['set_id'])), "</p>\n";
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"unlock_set\" />\n";
                        echo "<input type=\"hidden\" name=\"set_id\" value=\"", htmlspecialchars($_REQUEST['set_id']), "\" />\n";
                        echo $misc->form;
         */
        function doMergeReplicationSet($confirm, $msg = '') {
                global $slony, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                if ($confirm) {
                        if (!isset($_POST['target'])) $_POST['target'] = '';
                        $misc->printTitle($lang['strmerge']);
                        $misc->printMsg($msg);
        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
                        echo $misc->form;
                        echo "<table>\n";
                        echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strmergeinto']}</th>\n";
         */
        function doMoveReplicationSet($confirm, $msg = '') {
                global $slony, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                if ($confirm) {
                        if (!isset($_POST['new_origin'])) $_POST['new_origin'] = '';
                        $misc->printTitle($lang['strmove']);
                        $misc->printMsg($msg);
        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
                        echo $misc->form;
                        echo "<table>\n";
                        echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strneworigin']}</th>\n";
         */
        function doExecuteReplicationSet($confirm, $msg = '') {
                global $slony, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                if ($confirm) {
                        if (!isset($_POST['script'])) $_POST['script'] = '';
                        $misc->printTitle($lang['strexecute']);
                        $misc->printMsg($msg);
        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
                        echo $misc->form;
                        echo "<table>\n";
                        /* Slony 1.1 only
         * List all the tables in a replication set
         */
        function doTables($msg = '') {
-               global $PHP_SELF, $data, $slony, $misc;
+               global $data, $slony, $misc;
                global $lang;
 
                $misc->printTrail('database');
 
                $misc->printTable($tables, $columns, $actions, $lang['strnotables']);
                
-               echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?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";
        }
 
        /**
         */
        function doAddTable($stage, $msg = '') {
                global $data, $slony, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                switch ($stage) {
                        case 1:
                                $misc->printTitle($lang['straddtable']);
                                $misc->printMsg($msg);
                
-                               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                               echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
                                echo $misc->form;
                                echo "<table width=\"100%\">\n";
                                echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strtable']}</th>\n";
                                $misc->printTitle($lang['straddtable']);
                                $misc->printMsg($msg);
                
-                               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                               echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
                                echo $misc->form;
                                echo "<table>\n";
                                if ($indexes->recordCount() > 1) {
         */
        function doMoveTable($stage, $msg = '') {
                global $data, $slony, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                switch ($stage) {
                        case 1:
                                $misc->printTitle($lang['strmove']);
                                $misc->printMsg($msg);
                
-                               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                               echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
                                echo $misc->form;
                                echo "<table>\n";
                                echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strnewrepset']}</th>\n";
         */
        function doRemoveTable($confirm) {
                global $slony, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if ($confirm) {
                        $misc->printTrail('slony_cluster');
                        echo "<p>", sprintf($lang['strconfremovetablefromrepset'], 
                                $misc->printVal($_REQUEST['qualname']), $misc->printVal($_REQUEST['set_id'])), "</p>\n";
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop_table\" />\n";
                        echo "<input type=\"hidden\" name=\"set_id\" value=\"", htmlspecialchars($_REQUEST['set_id']), "\" />\n";
                        echo "<input type=\"hidden\" name=\"tab_id\" value=\"", htmlspecialchars($_REQUEST['tab_id']), "\" />\n";
         * List all the sequences in a replication set
         */
        function doSequences($msg = '') {
-               global $PHP_SELF, $data, $slony, $misc;
+               global $data, $slony, $misc;
                global $lang;
 
                $misc->printTrail('database');
                
                $misc->printTable($sequences, $columns, $actions, $lang['strnosequences']);
                
-               echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?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";
        }
 
        /**
         */
        function doAddSequence($stage, $msg = '') {
                global $data, $slony, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                switch ($stage) {
                        case 1:
                                $misc->printTitle($lang['straddsequence']);
                                $misc->printMsg($msg);
                
-                               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                               echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
                                echo $misc->form;
                                echo "<table width=\"100%\">\n";
                                echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strsequence']}</th>\n";
         */
        function doRemoveSequence($confirm) {
                global $slony, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if ($confirm) {
                        $misc->printTrail('slony_cluster');
                        echo "<p>", sprintf($lang['strconfremovesequencefromrepset'], 
                                $misc->printVal($_REQUEST['qualname']), $misc->printVal($_REQUEST['set_id'])), "</p>\n";
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop_sequence\" />\n";
                        echo "<input type=\"hidden\" name=\"set_id\" value=\"", htmlspecialchars($_REQUEST['set_id']), "\" />\n";
                        echo "<input type=\"hidden\" name=\"seq_id\" value=\"", htmlspecialchars($_REQUEST['seq_id']), "\" />\n";
         */
        function doMoveSequence($stage, $msg = '') {
                global $data, $slony, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                switch ($stage) {
                        case 1:
                                $misc->printTitle($lang['strmove']);
                                $misc->printMsg($msg);
                
-                               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                               echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
                                echo $misc->form;
                                echo "<sequence>\n";
                                echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strnewrepset']}</th>\n";
         * Display the properties of a subscription
         */      
        function doSubscription($msg = '') {
-               global $data, $slony, $misc, $PHP_SELF;
+               global $data, $slony, $misc;
                global $lang;
                
                $misc->printTrail('slony_subscription');
index a03f87e21c36f12e965902325b5874524ed7b0e0..5dbc211ce0daca37d6538ed9785b4dbb9fda7350 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage privileges in a database
         *
-        * $Id: privileges.php,v 1.39.2.1 2007/05/28 17:21:56 ioguix Exp $
+        * $Id: privileges.php,v 1.39.2.2 2007/07/09 14:55:22 xzilla Exp $
         */
 
        // Include application functions
@@ -20,7 +20,7 @@
         */
        function doAlter($confirm, $mode, $msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if (!isset($_REQUEST['username'])) $_REQUEST['username'] = array();
                if (!isset($_REQUEST['groupname'])) $_REQUEST['groupname'] = array();
@@ -44,7 +44,7 @@
                        }
                        $misc->printMsg($msg);
                        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"privileges.php\" method=\"post\">\n";
                        echo "<table>\n";
                        echo "<tr><th class=\"data left\">{$lang['strusers']}</th>\n";
                        echo "<td class=\"data1\"><select name=\"username[]\" multiple=\"multiple\" size=\"", min(6, $users->recordCount()), "\">\n";
         */
        function doDefault($msg = '') {
                global $data, $misc, $database;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                $misc->printTrail($_REQUEST['subject']);
                
                
                if ($_REQUEST['subject'] == 'function') {
                        $objectoid = $_REQUEST[$_REQUEST['subject'].'_oid'];
-                       $alterurl = "{$PHP_SELF}?action=alter&amp;{$misc->href}&amp;{$subject}={$object}&amp;{$subject}_oid=$objectoid&amp;subject={$subject}&amp;mode=";
+                       $alterurl = "privileges.php?action=alter&amp;{$misc->href}&amp;{$subject}={$object}&amp;{$subject}_oid=$objectoid&amp;subject={$subject}&amp;mode=";
                } else {
-                       $alterurl = "{$PHP_SELF}?action=alter&amp;{$misc->href}&amp;{$subject}={$object}&amp;subject={$subject}&amp;mode=";
+                       $alterurl = "privileges.php?action=alter&amp;{$misc->href}&amp;{$subject}={$object}&amp;subject={$subject}&amp;mode=";
                }
        
                echo "<p><a class=\"navlink\" href=\"{$alterurl}grant\">{$lang['strgrant']}</a> |\n";
index dfd9e949888d1ca8d67a22b15516c0a38e199014..002c08969080d93a8b4568554b4f7ab9325c8d3e 100644 (file)
@@ -8,8 +8,6 @@
        
        $url = parse_url($misc->getLastTabURL($subject));
        
-       $PHP_SELF = $url['path'];
-       
        // Load query vars into superglobal arrays
        if (isset($url['query'])) {
                $vars = array();
index 8ba3ed6955e9c26e8b3681a6377d137eb7a07ae1..7ef2be81b9cd1cee8b1f534e349dfb5074cccd19 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * List reports in a database
         *
-        * $Id: reports.php,v 1.22.4.1 2007/05/28 17:21:56 ioguix Exp $
+        * $Id: reports.php,v 1.22.4.2 2007/07/09 14:55:22 xzilla Exp $
         */
 
        // Include application functions
@@ -16,7 +16,7 @@
         */
        function doEdit($msg = '') {
                global $data, $reportsdb, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                // If it's a first, load then get the data from the database
                $report = $reportsdb->getReport($_REQUEST['report_id']);
@@ -35,7 +35,7 @@
                $misc->printTitle($lang['stredit']);
                $misc->printMsg($msg);
 
-               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+               echo "<form action=\"reports.php\" method=\"post\">\n";
                echo $misc->form;
                echo "<table width=\"100%\">\n";
                echo "<tr><th class=\"data left required\">{$lang['strname']}</th>\n";
@@ -94,7 +94,7 @@
         */
        function doProperties($msg = '') {
                global $data, $reportsdb, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                $report = $reportsdb->getReport($_REQUEST['report_id']);
 
                }
                else echo "<p>{$lang['strinvalidparam']}</p>\n";
 
-               echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?{$misc->href}\">{$lang['strshowallreports']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"$PHP_SELF?action=edit&amp;{$misc->href}&amp;report_id={$report->f['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->f['report_id']}\">{$lang['stredit']}</a></p>\n";
        }
 
        /**
         */
        function doCreate($msg = '') {
                global $data, $reportsdb, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if (!isset($_REQUEST['report_name'])) $_REQUEST['report_name'] = '';
                if (!isset($_REQUEST['db_name'])) $_REQUEST['db_name'] = (isset($_REQUEST['database']) ? $_REQUEST['database'] : '');
                $misc->printTitle($lang['strcreatereport']);
                $misc->printMsg($msg);
 
-               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+               echo "<form action=\"reports.php\" method=\"post\">\n";
                echo $misc->form;
                echo "<table width=\"100%\">\n";
                echo "<tr><th class=\"data left required\">{$lang['strname']}</th>\n";
        function doDrop($confirm) {
                global $reportsdb, $misc;
                global $lang;
-               global $PHP_SELF;
 
                if ($confirm) {
                        // Fetch report from the database
 
                        echo "<p>", sprintf($lang['strconfdropreport'], $misc->printVal($report->f['report_name'])), "</p>\n";
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"reports.php\" method=\"post\">\n";
                        echo $misc->form;
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
                        echo "<input type=\"hidden\" name=\"report_id\" value=\"", htmlspecialchars($_REQUEST['report_id']), "\" />\n";
         */
        function doDefault($msg = '') {
                global $data, $misc, $reportsdb;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                $misc->printTrail('server');
                $misc->printTabs('server','reports');
                        ),
                );
                
-               $return_url = urlencode("{$PHP_SELF}?{$misc->href}");
+               $return_url = urlencode("reports.php?{$misc->href}");
                
                $actions = array(
                        'properties' => array(
                                'title' => $lang['strproperties'],
-                               'url'   => "{$PHP_SELF}?action=properties&amp;{$misc->href}&amp;",
+                               'url'   => "reports.php?action=properties&amp;{$misc->href}&amp;",
                                'vars'  => array('report_id' => 'report_id'),
                        ),
                        'run' => array(
                        ),
                        'edit' => array(
                                'title' => $lang['stredit'],
-                               'url'   => "{$PHP_SELF}?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'   => "{$PHP_SELF}?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=\"{$PHP_SELF}?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']);
index f8c775a2323beabf21620c70167d7292634cd0da..df8d7c3fde1adbefd28347c7bf76eca1fcd87732 100644 (file)
--- a/roles.php
+++ b/roles.php
@@ -17,7 +17,7 @@
         */
        function doCreate($msg = '') {
                global $data, $misc, $username;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                if (!isset($_POST['formRolename'])) $_POST['formRolename'] = '';
                if (!isset($_POST['formPassword'])) $_POST['formPassword'] = '';
@@ -32,7 +32,7 @@
                $misc->printTitle($lang['strcreaterole'],'pg.role.create');
                $misc->printMsg($msg);
 
-               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+               echo "<form action=\"roles.php\" method=\"post\">\n";
                echo $misc->form;
                echo "<table>\n";
                echo "\t<tr>\n\t\t<th class=\"data left required\" width=\"130\">{$lang['strrolename']}</th>\n";
         */
        function doAlter($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                $misc->printTrail('role');
                $misc->printTitle($lang['stralterrole'],'pg.role.alter');
                                $_POST['formPassword'] = '';
                        }
                
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"roles.php\" method=\"post\">\n";
                        echo $misc->form;
                        echo "<table>\n";
                        echo "\t<tr>\n\t\t<th class=\"data left\" width=\"130\">{$lang['strrolename']}</th>\n";
         */
        function doDrop($confirm) {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if ($confirm) {
                        $misc->printTrail('role');
                        
                        echo "<p>", sprintf($lang['strconfdroprole'], $misc->printVal($_REQUEST['rolename'])), "</p>\n";        
                        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"roles.php\" method=\"post\">\n";
                        echo $misc->form;
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
                        echo "<input type=\"hidden\" name=\"rolename\" value=\"", htmlspecialchars($_REQUEST['rolename']), "\" />\n";
         */
        function doProperties($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                $misc->printTrail('role');
                $misc->printTitle($lang['strproperties'],'pg.role');
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
 
-               echo "<p><a class=\"navlink\" href=\"$PHP_SELF?{$misc->href}\">{$lang['strshowallroles']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"$PHP_SELF?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=\"$PHP_SELF?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";
        }
 
         */
        function doAccount($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $server_info = $misc->getServerInfo();
                
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
                
-               echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?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";
        }
        
        /**
         */
        function doChangePassword($confirm, $msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang, $conf;
+               global $lang, $conf;
                
                $server_info = $misc->getServerInfo();
                
                        if (!isset($_POST['password'])) $_POST['password'] = '';
                        if (!isset($_POST['confirm'])) $_POST['confirm'] = '';
                        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"roles.php\" method=\"post\">\n";
                        echo $misc->form;
                        echo "<table>\n";
                        echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strpassword']}</th>\n";
         */
        function doDefault($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                function renderRoleConnLimit($val) {
                        return $val == '-1' ? 'No limit' : htmlspecialchars($val);
                        ),              
                        'alter' => array(
                                'title' => $lang['stralter'],
-                               'url'   => "{$PHP_SELF}?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'   => "{$PHP_SELF}?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=\"{$PHP_SELF}?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";
 
        }
 
index bd7b0a21c5d6d51d8a284e5cafea0da21be8c380..9982c7faac809f8a587864b5a68afdaf045b60b9 100644 (file)
--- a/rules.php
+++ b/rules.php
@@ -3,7 +3,7 @@
        /**
         * List rules on a table OR view
         *
-        * $Id: rules.php,v 1.27.2.1 2007/05/28 17:21:56 ioguix Exp $
+        * $Id: rules.php,v 1.27.2.2 2007/07/09 14:55:22 xzilla Exp $
         */
 
        // Include application functions
@@ -15,7 +15,7 @@
         * Confirm and then actually create a rule
         */
        function createRule($confirm, $msg = '') {
-               global $PHP_SELF, $data, $data, $misc;
+               global $data, $data, $misc;
                global $lang;
 
                if (!isset($_POST['name'])) $_POST['name'] = '';
@@ -29,7 +29,7 @@
                        $misc->printTitle($lang['strcreaterule'],'pg.rule.create');
                        $misc->printMsg($msg);
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"rules.php\" method=\"post\">\n";
                        echo "<table>\n";
                        echo "<tr><th class=\"data left required\">{$lang['strname']}</th>\n";
                        echo "<td class=\"data1\"><input name=\"name\" size=\"16\" maxlength=\"{$data->_maxNameLen}\" value=\"",
@@ -86,7 +86,7 @@
         */
        function doDrop($confirm) {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if ($confirm) {
                        $misc->printTrail($_REQUEST['subject']);
@@ -95,7 +95,7 @@
                        echo "<p>", sprintf($lang['strconfdroprule'], $misc->printVal($_REQUEST['rule']),
                                $misc->printVal($_REQUEST[$_REQUEST['reltype']])), "</p>\n";
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"rules.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
                        echo "<input type=\"hidden\" name=\"subject\" value=\"", htmlspecialchars($_REQUEST['reltype']), "\" />\n";
                        echo "<input type=\"hidden\" name=\"", htmlspecialchars($_REQUEST['reltype']),
         */
        function doDefault($msg = '') {
                global $data, $misc;
-               global $PHP_SELF;
                global $lang;
 
                $misc->printTrail($_REQUEST['subject']);
                $actions = array(
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "{$PHP_SELF}?action=confirm_drop&amp;{$misc->href}&amp;reltype={$subject}&amp;{$subject}={$object}&amp;subject=rule&amp;",
+                               'url'   => "rules.php?action=confirm_drop&amp;{$misc->href}&amp;reltype={$subject}&amp;{$subject}={$object}&amp;subject=rule&amp;",
                                'vars'  => array('rule' => 'rulename'),
                        ),
                );
 
                $misc->printTable($rules, $columns, $actions, $lang['strnorules']);
 
-               echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?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";
        }
 
        // Different header if we're view rules or table rules
index 1b8e5a6e3c4c144034401513d2c7b3d5236a8e3c..731960736859ad7e0bd7b2870ddbfb9cf6ff304f 100755 (executable)
@@ -3,7 +3,7 @@
        /**
         * Manage schemas in a database
         *
-        * $Id: schemas.php,v 1.8.2.1 2007/05/28 17:21:56 ioguix Exp $
+        * $Id: schemas.php,v 1.8.2.2 2007/07/09 14:55:22 xzilla Exp $
         */
 
        // Include application functions
@@ -17,7 +17,7 @@
         */
        function doDefault($msg = '') {
                global $data, $misc, $conf;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $misc->printTrail('database');
                $misc->printTabs('database','schemas');
@@ -53,7 +53,7 @@
                                ),
                                'drop' => array(
                                        'title' => $lang['strdrop'],
-                                       'url'   => "{$PHP_SELF}?action=drop&amp;{$misc->href}&amp;",
+                                       'url'   => "schemas.php?action=drop&amp;{$misc->href}&amp;",
                                        'vars'  => array('schema' => 'nspname'),
                                ),
                                'privileges' => array(
                                ),
                                'alter' => array(
                                        'title' => $lang['stralter'],
-                                       'url'   => "{$PHP_SELF}?action=alter&amp;{$misc->href}&amp;",
+                                       'url'   => "schemas.php?action=alter&amp;{$misc->href}&amp;",
                                        'vars'  => array('schema' => 'nspname'),
                                ),
                        );
                        
                        $misc->printTable($schemas, $columns, $actions, $lang['strnoschemas']);
 
-                       echo "<p><a class=\"navlink\" href=\"$PHP_SELF?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";
@@ -82,7 +82,7 @@
         */
        function doCreate($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                $server_info = $misc->getServerInfo();
                
@@ -98,7 +98,7 @@
                $misc->printTitle($lang['strcreateschema'],'pg.schema.create');
                $misc->printMsg($msg);
                
-               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+               echo "<form action=\"schemas.php\" method=\"post\">\n";
                echo $misc->form;
                echo "<table width=\"100%\">\n";
                echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strname']}</th>\n";
         * TODO: permit changing name, owner
         */
        function doAlter($msg = '') {
-               global $data, $misc,$PHP_SELF, $lang;
+               global $data, $misc, $lang;
                
                $misc->printTrail('schema');
                $misc->printTitle($lang['stralter'],'pg.schema.alter');
                        if (!isset($_POST['schema'])) $_POST['schema'] = $_REQUEST['schema'];
                        if (!isset($_POST['name'])) $_POST['name'] = $_REQUEST['schema'];
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"schemas.php\" method=\"post\">\n";
                        echo "<table>\n";
                
                        echo "\t<tr>\n";
         * Save the form submission containing changes to a schema
         */
        function doSaveAlter($msg = '') {
-               global $data, $misc,$PHP_SELF, $lang;
+               global $data, $misc, $lang;
                
                $status = $data->updateSchema($_POST['schema'], $_POST['comment'], $_POST['name']);
                if ($status == 0)
         * Show confirmation of drop and perform actual drop
         */
        function doDrop($confirm) {
-               global $PHP_SELF, $data, $data, $misc;
+               global $data, $data, $misc;
                global $lang, $_reload_browser;
 
                if ($confirm) {
 
                        echo "<p>", sprintf($lang['strconfdropschema'], $misc->printVal($_REQUEST['schema'])), "</p>\n";
 
-                       echo "<form action=\"{$PHP_SELF}\" method=\"post\">\n";
+                       echo "<form action=\"schemas.php\" method=\"post\">\n";
                        echo $misc->form;
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
                        echo "<input type=\"hidden\" name=\"database\" value=\"", htmlspecialchars($_REQUEST['database']), "\" />\n";
         * Generate XML for the browser tree.
         */
        function doTree() {
-               global $misc, $data, $lang, $PHP_SELF, $slony;
+               global $misc, $data, $lang, $slony;
                
                $schemas = $data->getSchemas();
                
index fabbd3b22a538ba2b5ed742982b9b4340d7ad72e..471950224dc43bd48e356c0d4fc64346e1f2100a 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage sequences in a database
         *
-        * $Id: sequences.php,v 1.36.2.1 2007/05/28 17:21:56 ioguix Exp $
+        * $Id: sequences.php,v 1.36.2.2 2007/07/09 14:55:22 xzilla Exp $
         */
        
        // Include application functions
@@ -17,7 +17,7 @@
         */     
        function doDefault($msg = '')   {
                global $data, $conf, $misc; 
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $misc->printTrail('schema');
                $misc->printTabs('schema', 'sequences');
@@ -47,7 +47,7 @@
                $actions = array(
                        'properties' => array(
                                'title' => $lang['strproperties'],
-                               'url'   => "{$PHP_SELF}?action=properties&amp;{$misc->href}&amp;",
+                               'url'   => "sequences.php?action=properties&amp;{$misc->href}&amp;",
                                'vars'  => array('sequence' => 'seqname'),
                        ),
                        'alter' => array(
@@ -57,7 +57,7 @@
                        ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "{$PHP_SELF}?action=confirm_drop&amp;{$misc->href}&amp;",
+                               'url'   => "sequences.php?action=confirm_drop&amp;{$misc->href}&amp;",
                                'vars'  => array('sequence' => 'seqname'),
                        ),
                        'privileges' => array(
@@ -70,7 +70,7 @@
                if (!$data->hasAlterSequence()) unset($actions['alter']);
                $misc->printTable($sequences, $columns, $actions, $lang['strnosequences']);
                
-               echo "<p><a class=\"navlink\" href=\"$PHP_SELF?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";
        }
        
        /**
         * Display the properties of a sequence
         */      
        function doProperties($msg = '') {
-               global $data, $misc, $PHP_SELF;
+               global $data, $misc;
                global $lang;
                
                $misc->printTrail('sequence');
                        echo "</table>";
                        
                        if ($data->hasAlterSequence()) {
-                               echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?action=confirm_alter&amp;{$misc->href}&amp;sequence=", urlencode($sequence->f['seqname']), "\">{$lang['straltersequence']}</a> |\n";
+                               echo "<p><a class=\"navlink\" href=\"sequences.php?action=confirm_alter&amp;{$misc->href}&amp;sequence=", urlencode($sequence->f['seqname']), "\">{$lang['straltersequence']}</a> |\n";
                        }
-                       echo "<a class=\"navlink\" href=\"{$PHP_SELF}?action=confirm_setval&amp;{$misc->href}&amp;sequence=", urlencode($sequence->f['seqname']), "\">{$lang['strsetval']}</a> |\n";
-                       echo "<a class=\"navlink\" href=\"{$PHP_SELF}?action=nextval&amp;{$misc->href}&amp;sequence=", urlencode($sequence->f['seqname']), "\">{$lang['strnextval']}</a> |\n";
-                       echo "<a class=\"navlink\" href=\"{$PHP_SELF}?action=reset&amp;{$misc->href}&amp;sequence=", urlencode($sequence->f['seqname']), "\">{$lang['strreset']}</a> |\n";
-                       echo "<a class=\"navlink\" href=\"{$PHP_SELF}?{$misc->href}\">{$lang['strshowallsequences']}</a></p>\n";
+                       echo "<a class=\"navlink\" href=\"sequences.php?action=confirm_setval&amp;{$misc->href}&amp;sequence=", urlencode($sequence->f['seqname']), "\">{$lang['strsetval']}</a> |\n";
+                       echo "<a class=\"navlink\" href=\"sequences.php?action=nextval&amp;{$misc->href}&amp;sequence=", urlencode($sequence->f['seqname']), "\">{$lang['strnextval']}</a> |\n";
+                       echo "<a class=\"navlink\" href=\"sequences.php?action=reset&amp;{$misc->href}&amp;sequence=", urlencode($sequence->f['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";
        }
         */             
        function doDrop($confirm, $msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                if ($confirm) {
                        $misc->printTrail('sequence');
                        
                        echo "<p>", sprintf($lang['strconfdropsequence'], $misc->printVal($_REQUEST['sequence'])), "</p>\n";
                        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"sequences.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
                        echo "<input type=\"hidden\" name=\"sequence\" value=\"", htmlspecialchars($_REQUEST['sequence']), "\" />\n";
                        echo $misc->form;
         */
        function doCreateSequence($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                if (!isset($_POST['formSequenceName'])) $_POST['formSequenceName'] = '';
                if (!isset($_POST['formIncrement'])) $_POST['formIncrement'] = '';
                $misc->printTitle($lang['strcreatesequence'],'pg.sequence.create');
                $misc->printMsg($msg);
                
-               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+               echo "<form action=\"sequences.php\" method=\"post\">\n";
                echo "<table>\n";
                
                echo "<tr><th class=\"data left required\">{$lang['strname']}</th>\n";
         */
        function doReset() {
                global $data;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $status = $data->resetSequence($_REQUEST['sequence']);
                if ($status == 0)
         */
        function doNextval() {
                global $data;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $status = $data->nextvalSequence($_REQUEST['sequence']);
                if ($status == 0)
         */
        function doSetval($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $misc->printTrail('sequence');
                $misc->printTitle($lang['strsetval'], 'pg.sequence');
                $sequence = $data->getSequence($_REQUEST['sequence']);          
                
                if (is_object($sequence) && $sequence->recordCount() > 0) {
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"sequences.php\" method=\"post\">\n";
                        echo "<table border=\"0\">";
                        echo "<tr><th class=\"data left required\">{$lang['strlastvalue']}</th>\n";
                        echo "<td class=\"data1\">";
         */
        function doAlter($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $misc->printTrail('sequence');
                $misc->printTitle($lang['stralter'], 'pg.sequence.alter');
                        $sequence->f['is_cycled'] = $data->phpBool($sequence->f['is_cycled']);
                        if ($sequence->f['is_cycled']) $_POST['formCycledValue'] = 'on';
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"sequences.php\" method=\"post\">\n";
                        echo "<table>\n";
                        
                        echo "<tr><th class=\"data left\">{$lang['strincrementby']}</th>\n";
index 10d96ddf580207a99f6c8b9cc63396e560a055da..fdddf415a30c3e3d5ef2941ccc102dcd1117618e 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage servers
         *
-        * $Id: servers.php,v 1.5.2.1 2007/05/28 17:21:56 ioguix Exp $
+        * $Id: servers.php,v 1.5.2.2 2007/07/09 14:55:22 xzilla Exp $
         */
 
        // Include application functions
@@ -25,7 +25,7 @@
 
        function doDefault($msg = '') {
                global $conf, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $misc->printTabs('root','servers');
                $misc->printMsg($msg);
@@ -67,7 +67,7 @@
                        ),
                        'logout' => array(
                                'title' => $lang['strlogout'],
-                               'url'   => "{$PHP_SELF}?action=logout&amp;",
+                               'url'   => "servers.php?action=logout&amp;",
                                'vars'  => array('logoutServer' => 'id'),
                        ),
                );
index c6a1373c630e189f90f74c2c3b539990fe44956d..65342cddba57d74015ef42bb6125ea9d26951cac 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Alternative SQL editing window
         *
-        * $Id: sqledit.php,v 1.30.2.1 2007/05/28 17:21:56 ioguix Exp $
+        * $Id: sqledit.php,v 1.30.2.2 2007/07/09 14:55:22 xzilla Exp $
         */
 
        // Include application functions
@@ -82,7 +82,7 @@
         * Searches for a named database object
         */
        function doFind() {
-               global $PHP_SELF, $data, $misc;
+               global $data, $misc;
                global $lang, $conf;
                
                if (!isset($_GET['term'])) $_GET['term'] = '';
         * Allow execution of arbitrary SQL statements on a database
         */
        function doDefault() {
-               global $PHP_SELF, $data, $misc;
+               global $data, $misc;
                global $lang, $conf;
                
                if (!isset($_REQUEST['query'])) $_REQUEST['query'] = '';
index 9f75b69306b522a7ac64e70162f7feca29fcd7a3..58c33205197e7e8295f374232218229782f1bba0 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * List tables in a database
         *
-        * $Id: tables.php,v 1.82.2.1 2007/05/28 17:21:56 ioguix Exp $
+        * $Id: tables.php,v 1.82.2.2 2007/07/09 14:55:22 xzilla Exp $
         */
 
        // Include application functions
@@ -16,7 +16,7 @@
         */
        function doCreate($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if (!isset($_REQUEST['stage'])) {
                        $_REQUEST['stage'] = 1;
@@ -38,7 +38,7 @@
                                $misc->printTitle($lang['strcreatetable'], 'pg.table.create');
                                $misc->printMsg($msg);
                                
-                               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                               echo "<form action=\"tables.php\" method=\"post\">\n";
                                echo "<table>\n";
                                echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strname']}</th>\n";
                                echo "\t\t<td class=\"data\"><input name=\"name\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"", 
                                $misc->printMsg($msg);
 
                                echo "<script src=\"tables.js\" type=\"text/javascript\"></script>";
-                               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                               echo "<form action=\"tables.php\" method=\"post\">\n";
 
                                // Output table header
                                echo "<table>\n";
        function doSelectRows($confirm, $msg = '') {
                global $data, $misc, $_no_output;
                global $lang;
-               global $PHP_SELF;
 
                if ($confirm) {
                        $misc->printTrail('table');
 
                        $attrs = $data->getTableAttributes($_REQUEST['table']);
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\" name=\"selectform\">\n";
+                       echo "<form action=\"tables.php\" method=\"post\" name=\"selectform\">\n";
                        if ($attrs->recordCount() > 0) {
                                // JavaScript for select all feature
                                echo "<script type=\"text/javascript\">\n";
        function doInsertRow($confirm, $msg = '') {
                global $data, $misc, $conf;
                global $lang;
-               global $PHP_SELF;
 
                $bAllowAC = ($conf["autocomplete"]!='disable') ? TRUE : FALSE ;
 
                                }
                        }
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\" id=\"ac_form\">\n";
+                       echo "<form action=\"tables.php\" method=\"post\" id=\"ac_form\">\n";
                        if ($attrs->recordCount() > 0) {
                                echo "<table>\n";
 
        function doEmpty($confirm) {
                global $data, $misc;
                global $lang;
-               global $PHP_SELF;
 
                if ($confirm) {
                        $misc->printTrail('table');
 
                        echo "<p>", sprintf($lang['strconfemptytable'], $misc->printVal($_REQUEST['table'])), "</p>\n";
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"tables.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"empty\" />\n";
                        echo "<input type=\"hidden\" name=\"table\" value=\"", htmlspecialchars($_REQUEST['table']), "\" />\n";
                        echo $misc->form;
        function doDrop($confirm) {
                global $data, $misc;
                global $lang, $_reload_browser;
-               global $PHP_SELF;
 
                if ($confirm) {
                        $misc->printTrail('table');
 
                        echo "<p>", sprintf($lang['strconfdroptable'], $misc->printVal($_REQUEST['table'])), "</p>\n";
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"tables.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
                        echo "<input type=\"hidden\" name=\"table\" value=\"", htmlspecialchars($_REQUEST['table']), "\" />\n";
                        echo $misc->form;
        function doVacuum($confirm) {
                global $data, $misc;
                global $lang, $_reload_browser;
-               global $PHP_SELF;
 
                if ($confirm) {
                        $misc->printTrail('table');
 
                        echo "<p>", sprintf($lang['strconfvacuumtable'], $misc->printVal($_REQUEST['table'])), "</p>\n";
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"tables.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"vacuum\" />\n";
                        echo "<input type=\"hidden\" name=\"table\" value=\"", htmlspecialchars($_REQUEST['table']), "\" />\n";
                        echo $misc->form;
         */
        function doDefault($msg = '') {
                global $data, $conf, $misc, $data;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $misc->printTrail('schema');
                $misc->printTabs('schema','tables');
                        ),
                        'select' => array(
                                'title' => $lang['strselect'],
-                               'url'   => "{$PHP_SELF}?action=confselectrows&amp;{$misc->href}&amp;",
+                               'url'   => "tables.php?action=confselectrows&amp;{$misc->href}&amp;",
                                'vars'  => array('table' => 'relname'),
                        ),
                        'insert' => array(
                                'title' => $lang['strinsert'],
-                               'url'   => "{$PHP_SELF}?action=confinsertrow&amp;{$misc->href}&amp;",
+                               'url'   => "tables.php?action=confinsertrow&amp;{$misc->href}&amp;",
                                'vars'  => array('table' => 'relname'),
                        ),
                        'empty' => array(
                                'title' => $lang['strempty'],
-                               'url'   => "{$PHP_SELF}?action=confirm_empty&amp;{$misc->href}&amp;",
+                               'url'   => "tables.php?action=confirm_empty&amp;{$misc->href}&amp;",
                                'vars'  => array('table' => 'relname'),
                        ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "{$PHP_SELF}?action=confirm_drop&amp;{$misc->href}&amp;",
+                               'url'   => "tables.php?action=confirm_drop&amp;{$misc->href}&amp;",
                                'vars'  => array('table' => 'relname'),
                        ),
                        'vacuum' => array(
                                'title' => $lang['strvacuum'],
-                               'url'   => "{$PHP_SELF}?action=confirm_vacuum&amp;{$misc->href}&amp;",
+                               'url'   => "tables.php?action=confirm_vacuum&amp;{$misc->href}&amp;",
                                'vars'  => array('table' => 'relname'),
                        ),
                );
 
                $misc->printTable($tables, $columns, $actions, $lang['strnotables']);
 
-               echo "<p><a class=\"navlink\" href=\"$PHP_SELF?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";
        }
        
        /**
index 95292dd11c2d3b76e2bc318271d0b7db6172336b..d2930eff8a45df5c58ca6b5ed4e023673d0da38e 100755 (executable)
@@ -3,7 +3,7 @@
        /**
         * Manage tablespaces in a database cluster
         *
-        * $Id: tablespaces.php,v 1.10.2.1 2007/05/28 17:21:56 ioguix Exp $
+        * $Id: tablespaces.php,v 1.10.2.2 2007/07/09 14:55:22 xzilla Exp $
         */
 
        // Include application functions
@@ -17,7 +17,7 @@
         */
        function doAlter($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $misc->printTrail('tablespace');
                $misc->printTitle($lang['stralter'],'pg.tablespace.alter');
@@ -36,7 +36,7 @@
                                $_POST['comment'] = ($data->hasSharedComments()) ? $tablespace->f['spccomment'] : '';
                        }
                        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"tablespaces.php\" method=\"post\">\n";
                        echo $misc->form;
                        echo "<table>\n";
                        echo "<tr><th class=\"data left required\">{$lang['strname']}</th>\n";
@@ -97,7 +97,7 @@
         */
        function doDrop($confirm) {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if ($confirm) {
                        $misc->printTrail('tablespace');
                        
                        echo "<p>", sprintf($lang['strconfdroptablespace'], $misc->printVal($_REQUEST['tablespace'])), "</p>\n";        
                        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"tablespaces.php\" method=\"post\">\n";
                        echo $misc->form;
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
                        echo "<input type=\"hidden\" name=\"tablespace\" value=\"", htmlspecialchars($_REQUEST['tablespace']), "\" />\n";
         */
        function doCreate($msg = '') {
                global $data, $misc, $spcname;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $server_info = $misc->getServerInfo();
                
                $misc->printTitle($lang['strcreatetablespace'],'pg.tablespace.create');
                $misc->printMsg($msg);
 
-               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+               echo "<form action=\"tablespaces.php\" method=\"post\">\n";
                echo $misc->form;
                echo "<table>\n";
                echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strname']}</th>\n";
         */
        function doDefault($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $misc->printTrail('server');
                $misc->printTabs('server','tablespaces');
                $actions = array(
                        'alter' => array(
                                'title' => $lang['stralter'],
-                               'url'   => "{$PHP_SELF}?action=edit&amp;{$misc->href}&amp;",
+                               'url'   => "tablespaces.php?action=edit&amp;{$misc->href}&amp;",
                                'vars'  => array('tablespace' => 'spcname')
                        ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "{$PHP_SELF}?action=confirm_drop&amp;{$misc->href}&amp;",
+                               'url'   => "tablespaces.php?action=confirm_drop&amp;{$misc->href}&amp;",
                                'vars'  => array('tablespace' => 'spcname')
                        ),
                        'privileges' => array(
                                
                $misc->printTable($tablespaces, $columns, $actions, $lang['strnotablespaces']);
                
-               echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?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";
 
        }
 
index fa5f0778de7a36fbb9fb5b629fc33b84d9cc6a09..f9313bf5fb5a61be97548edebc9767c19f2dc229 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * List tables in a database
         *
-        * $Id: tblproperties.php,v 1.72.2.1 2007/05/28 17:21:56 ioguix Exp $
+        * $Id: tblproperties.php,v 1.72.2.2 2007/07/09 14:55:22 xzilla Exp $
         */
 
        // Include application functions
@@ -43,7 +43,7 @@
         */
        function doAlter($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $misc->printTrail('table');
                $misc->printTitle($lang['stralter'], 'pg.table.alter');
@@ -63,7 +63,7 @@
                        if (!isset($_POST['comment'])) $_POST['comment'] = $table->f['relcomment'];
                        if ($data->hasTablespaces() && !isset($_POST['tablespace'])) $_POST['tablespace'] = $table->f['tablespace'];
                        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"tblproperties.php\" method=\"post\">\n";
                        echo "<table>\n";
                        echo "<tr><th class=\"data left required\">{$lang['strname']}</th>\n";
                        echo "<td class=\"data1\">";
        
        function doExport($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                // Determine whether or not the table has an object ID
                $hasID = $data->hasObjectID($_REQUEST['table']);
        
        function doImport($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                $misc->printTrail('table');
                $misc->printTabs('table','import');
         */
        function doAddColumn($msg = '') {
                global $data, $misc, $_reload_browser;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if (!isset($_REQUEST['stage'])) $_REQUEST['stage'] = 1;
 
                                $misc->printTitle($lang['straddcolumn'], 'pg.column.add');
                                $misc->printMsg($msg);
                                echo "<script src=\"tables.js\" type=\"text/javascript\"></script>";
-                               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                               echo "<form action=\"tblproperties.php\" method=\"post\">\n";
 
                                // Output table header
                                echo "<table>\n";
         */
        function doProperties($msg = '') {
                global $data, $misc, $_reload_browser;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if (!isset($_REQUEST['stage'])) $_REQUEST['stage'] = 1;
 
                                $misc->printMsg($msg);
                                echo "<script src=\"tables.js\" type=\"text/javascript\"></script>";
 
-                               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                               echo "<form action=\"tblproperties.php\" method=\"post\">\n";
 
                                // Output table header
                                echo "<table>\n";
                                        htmlspecialchars($_REQUEST['field']), "\" /></td>";
                                        
                                // Column type
+                               $escaped_predef_types = array(); // the JS escaped array elements
                                if ($data->hasAlterColumnType()) {
                                        // Fetch all available types
                                        $types = $data->getTypes(true, false, true);
                                        echo "<option value=\"[]\"", ($_REQUEST['array'] == '[]') ? ' selected="selected"' : '', ">[ ]</option>\n";
                                        echo "</select>";
                                        $predefined_size_types = array_intersect($data->predefined_size_types,array_keys($types_for_js));
-                                       $escaped_predef_types = array(); // the JS escaped array elements
                                        foreach($predefined_size_types as $value) {
                                                $escaped_predef_types[] = "'{$value}'";
                                        }
         */
        function doDrop($confirm) {
                global $data, $database, $misc, $_reload_browser;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if ($confirm) {
                        $misc->printTrail('column');
                     $misc->printVal($_REQUEST['table'])), "</p>\n";
                                                                
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"tblproperties.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
                        echo "<input type=\"hidden\" name=\"table\" value=\"", htmlspecialchars($_REQUEST['table']), "\" />\n";
                        echo "<input type=\"hidden\" name=\"column\" value=\"", htmlspecialchars($_REQUEST['column']), "\" />\n";
         */
        function doDefault($msg = '') {
                global $data, $conf, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                function attPre(&$rowdata) {
                        global $data;
                        ),
                        'alter' => array(
                                'title' => $lang['stralter'],
-                               'url'   => "{$PHP_SELF}?action=properties&amp;{$misc->href}&amp;table=".urlencode($_REQUEST['table'])."&amp;",
+                               'url'   => "tableproperties.php?action=properties&amp;{$misc->href}&amp;table=".urlencode($_REQUEST['table'])."&amp;",
                                'vars'  => array('column' => 'attname'),
                        ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "{$PHP_SELF}?action=confirm_drop&amp;{$misc->href}&amp;table=".urlencode($_REQUEST['table'])."&amp;",
+                               'url'   => "tblproperties.php?action=confirm_drop&amp;{$misc->href}&amp;table=".urlencode($_REQUEST['table'])."&amp;",
                                'vars'  => array('column' => 'attname'),
                        ),
                );
                echo "\t<li><a href=\"tables.php?action=confinsertrow&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),"\">{$lang['strinsert']}</a></li>\n";
                echo "\t<li><a href=\"tables.php?action=confirm_empty&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),"\">{$lang['strempty']}</a></li>\n";
                echo "\t<li><a href=\"tables.php?action=confirm_drop&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),"\">{$lang['strdrop']}</a></li>\n";
-               echo "\t<li><a href=\"{$PHP_SELF}?action=add_column&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),"\">{$lang['straddcolumn']}</a></li>\n";
-               echo "\t<li><a href=\"{$PHP_SELF}?action=confirm_alter&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),"\">{$lang['stralter']}</a></li>\n";
+               echo "\t<li><a href=\"tblproperties.php?action=add_column&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),"\">{$lang['straddcolumn']}</a></li>\n";
+               echo "\t<li><a href=\"tblproperties.php?action=confirm_alter&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),"\">{$lang['stralter']}</a></li>\n";
                echo "</ul>\n";
        }
 
index 7541c92ca28da3050ac805af927dbfae242d4af3..de3e5632aae6bcdf9cf872066fe928965bef0acb 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * List triggers on a table
         *
-        * $Id: triggers.php,v 1.30.2.1 2007/05/28 17:21:56 ioguix Exp $
+        * $Id: triggers.php,v 1.30.2.2 2007/07/09 14:55:22 xzilla Exp $
         */
 
        // Include application functions
@@ -30,7 +30,7 @@
         */
        function doAlter($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $misc->printTrail('trigger');
                $misc->printTitle($lang['stralter'],'pg.trigger.alter');
@@ -42,7 +42,7 @@
                        
                        if (!isset($_POST['name'])) $_POST['name'] = $triggerdata->f['tgname'];
                        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"triggers.php\" method=\"post\">\n";
                        echo "<table>\n";
                        echo "<tr><th class=\"data\">{$lang['strname']}</th>\n";
                        echo "<td class=\"data1\">";
@@ -65,7 +65,7 @@
         */
        function doDrop($confirm) {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if ($confirm) {
                        $misc->printTrail('trigger');
@@ -74,7 +74,7 @@
                        echo "<p>", sprintf($lang['strconfdroptrigger'], $misc->printVal($_REQUEST['trigger']),
                                $misc->printVal($_REQUEST['table'])), "</p>\n";
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"triggers.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
                        echo "<input type=\"hidden\" name=\"table\" value=\"", htmlspecialchars($_REQUEST['table']), "\" />\n";
                        echo "<input type=\"hidden\" name=\"trigger\" value=\"", htmlspecialchars($_REQUEST['trigger']), "\" />\n";
         */
        function doEnable($confirm) {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if ($confirm) {
                        $misc->printTrail('trigger');
                        echo "<p>", sprintf($lang['strconfenabletrigger'], $misc->printVal($_REQUEST['trigger']),
                                $misc->printVal($_REQUEST['table'])), "</p>\n";
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"triggers.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"enable\" />\n";
                        echo "<input type=\"hidden\" name=\"table\" value=\"", htmlspecialchars($_REQUEST['table']), "\" />\n";
                        echo "<input type=\"hidden\" name=\"trigger\" value=\"", htmlspecialchars($_REQUEST['trigger']), "\" />\n";
         */
        function doDisable($confirm) {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if ($confirm) {
                        $misc->printTrail('trigger');
                        echo "<p>", sprintf($lang['strconfdisabletrigger'], $misc->printVal($_REQUEST['trigger']),
                                $misc->printVal($_REQUEST['table'])), "</p>\n";
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"triggers.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"disable\" />\n";
                        echo "<input type=\"hidden\" name=\"table\" value=\"", htmlspecialchars($_REQUEST['table']), "\" />\n";
                        echo "<input type=\"hidden\" name=\"trigger\" value=\"", htmlspecialchars($_REQUEST['trigger']), "\" />\n";
         */
        function doCreate($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $misc->printTrail('table');
                $misc->printTitle($lang['strcreatetrigger'],'pg.trigger.create');
                $sel3 = new XHTML_Select('formFrequency');
                $sel3->set_data($data->triggerFrequency);
                
-               echo "<form action=\"$PHP_SELF\" method=\"POST\">\n";
+               echo "<form action=\"triggers.php\" method=\"POST\">\n";
                echo "<table>\n";
                echo "<tr>\n";
                echo "          <th class=\"data\">{$lang['strname']}</th>\n";
         */
        function doSaveCreate() {
                global $data;
-               global $PHP_SELF, $lang;                
+               global $lang;           
        
                // Check that they've given a name and a definition
 
         */
        function doDefault($msg = '') {
                global $data, $misc, $database;
-               global $PHP_SELF;
                global $lang;
 
                function tgPre(&$rowdata) {
                $actions = array(
                        'alter' => array(
                                'title' => $lang['stralter'],
-                               'url'   => "{$PHP_SELF}?action=confirm_alter&amp;{$misc->href}&amp;table=".urlencode($_REQUEST['table'])."&amp;",
+                               'url'   => "triggers.php?action=confirm_alter&amp;{$misc->href}&amp;table=".urlencode($_REQUEST['table'])."&amp;",
                                'vars'  => array('trigger' => 'tgname'),
                        ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "{$PHP_SELF}?action=confirm_drop&amp;{$misc->href}&amp;table=".urlencode($_REQUEST['table'])."&amp;",
+                               'url'   => "triggers.php?action=confirm_drop&amp;{$misc->href}&amp;table=".urlencode($_REQUEST['table'])."&amp;",
                                'vars'  => array('trigger' => 'tgname'),
                        ),
                );
                        if(!$data->phpBool($triggers->fields["tgenabled"])) {
                                $actions['enable'] = array(
                                        'title' => $lang['strenable'],
-                                       'url'   => "{$PHP_SELF}?action=confirm_enable&amp;{$misc->href}&amp;table=".urlencode($_REQUEST['table'])."&amp;",
+                                       'url'   => "triggers.php?action=confirm_enable&amp;{$misc->href}&amp;table=".urlencode($_REQUEST['table'])."&amp;",
                                        'vars'  => array('trigger' => 'tgname'),
                                );
                        } else {
                                $actions['disable'] = array(
                                        'title' => $lang['strdisable'],
-                                       'url'   => "{$PHP_SELF}?action=confirm_disable&amp;{$misc->href}&amp;table=".urlencode($_REQUEST['table'])."&amp;",
+                                       'url'   => "triggers.php?action=confirm_disable&amp;{$misc->href}&amp;table=".urlencode($_REQUEST['table'])."&amp;",
                                        'vars'  => array('trigger' => 'tgname'),
                                );
                        }
                
                $misc->printTable($triggers, $columns, $actions, $lang['strnotriggers'], 'tgPre');
                
-               echo "<p><a class=\"navlink\" href=\"$PHP_SELF?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";
        }
 
        $misc->printHeader($lang['strtables'] . ' - ' . $_REQUEST['table'] . ' - ' . $lang['strtriggers']);
index 9f92a77ad9260a4e559cac85901f30b30d9b4b09..885325c8f69057c855dd1c3c2a6e486a9df6d083 100644 (file)
--- a/types.php
+++ b/types.php
@@ -3,7 +3,7 @@
        /**
         * Manage types in a database
         *
-        * $Id: types.php,v 1.31.2.1 2007/05/28 17:21:56 ioguix Exp $
+        * $Id: types.php,v 1.31.2.2 2007/07/09 14:55:22 xzilla Exp $
         */
 
        // Include application functions
@@ -17,7 +17,7 @@
         */
        function doProperties($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                // Get type (using base name)
                $typedata = $data->getType($_REQUEST['type']);
@@ -75,7 +75,7 @@
                                echo "</table>\n";
                        }
 
-                       echo "<p><a class=\"navlink\" href=\"$PHP_SELF?{$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']);
        }
@@ -85,7 +85,7 @@
         */
        function doDrop($confirm) {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if ($confirm) {
                        $misc->printTrail('type');
@@ -93,7 +93,7 @@
 
                        echo "<p>", sprintf($lang['strconfdroptype'], $misc->printVal($_REQUEST['type'])), "</p>\n";
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"types.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
                        echo "<input type=\"hidden\" name=\"type\" value=\"", htmlspecialchars($_REQUEST['type']), "\" />\n";
                        echo $misc->form;
         */
        function doCreateComposite($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if (!isset($_REQUEST['stage'])) $_REQUEST['stage'] = 1;
                if (!isset($_REQUEST['name'])) $_REQUEST['name'] = '';
                                $misc->printTitle($lang['strcreatecomptype'], 'pg.type.create');
                                $misc->printMsg($msg);
                                
-                               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                               echo "<form action=\"types.php\" method=\"post\">\n";
                                echo "<table>\n";
                                echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strname']}</th>\n";
                                echo "\t\t<td class=\"data\"><input name=\"name\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"", 
                                $misc->printTitle($lang['strcreatecomptype'], 'pg.type.create');
                                $misc->printMsg($msg);
 
-                               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                               echo "<form action=\"types.php\" method=\"post\">\n";
 
                                // Output table header
                                echo "<table>\n";
         */
        function doCreate($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if (!isset($_POST['typname'])) $_POST['typname'] = '';
                if (!isset($_POST['typin'])) $_POST['typin'] = '';
                $misc->printTitle($lang['strcreatetype'], 'pg.type.create');
                $misc->printMsg($msg);
 
-               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+               echo "<form action=\"types.php\" method=\"post\">\n";
                echo "<table>\n";
                echo "<tr><th class=\"data left required\">{$lang['strname']}</th>\n";
                echo "<td class=\"data1\"><input name=\"typname\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
         */
        function doDefault($msg = '') {
                global $data, $conf, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                $misc->printTrail('schema');
                $misc->printTabs('schema','types');
                $actions = array(
                        'properties' => array(
                                'title' => $lang['strproperties'],
-                               'url'   => "{$PHP_SELF}?action=properties&amp;{$misc->href}&amp;",
+                               'url'   => "types.php?action=properties&amp;{$misc->href}&amp;",
                                'vars'  => array('type' => 'basename'),
                        ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "{$PHP_SELF}?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=\"$PHP_SELF?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=\"$PHP_SELF?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";
 
        }
index 3679b4679a78ba90792a2e129f32940cbdfe7635..ed4d16172991075ffb12f3ca47c8c5be07225a5f 100644 (file)
--- a/users.php
+++ b/users.php
@@ -3,7 +3,7 @@
        /**
         * Manage users in a database cluster
         *
-        * $Id: users.php,v 1.32.2.1 2007/05/28 17:21:57 ioguix Exp $
+        * $Id: users.php,v 1.32.2.2 2007/07/09 14:55:22 xzilla Exp $
         */
 
        // Include application functions
@@ -20,7 +20,7 @@
         */
        function doAccount($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $server_info = $misc->getServerInfo();
                
@@ -47,7 +47,7 @@
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
                
-               echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?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";
        }
        
        /**
@@ -55,7 +55,7 @@
         */
        function doChangePassword($confirm, $msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang, $conf;
+               global $lang, $conf;
                
                $server_info = $misc->getServerInfo();
                
@@ -68,7 +68,7 @@
                        if (!isset($_POST['password'])) $_POST['password'] = '';
                        if (!isset($_POST['confirm'])) $_POST['confirm'] = '';
                        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"users.php\" method=\"post\">\n";
                        echo $misc->form;
                        echo "<table>\n";
                        echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strpassword']}</th>\n";
         */
        function doEdit($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
        
                $misc->printTrail('user');
                $misc->printTitle($lang['stralter'],'pg.user.alter');
                                $_POST['formPassword'] = '';
                        }
                
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"users.php\" method=\"post\">\n";
                        echo $misc->form;
                        echo "<table>\n";
                        echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strusername']}</th>\n";
         */
        function doDrop($confirm) {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if ($confirm) {
                        $misc->printTrail('user');
                        
                        echo "<p>", sprintf($lang['strconfdropuser'], $misc->printVal($_REQUEST['username'])), "</p>\n";        
                        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"users.php\" method=\"post\">\n";
                        echo $misc->form;
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
                        echo "<input type=\"hidden\" name=\"username\" value=\"", htmlspecialchars($_REQUEST['username']), "\" />\n";
         */
        function doCreate($msg = '') {
                global $data, $misc, $username;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                if (!isset($_POST['formUsername'])) $_POST['formUsername'] = '';
                if (!isset($_POST['formPassword'])) $_POST['formPassword'] = '';
                $misc->printTitle($lang['strcreateuser'],'pg.user.create');
                $misc->printMsg($msg);
 
-               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+               echo "<form action=\"users.php\" method=\"post\">\n";
                echo $misc->form;
                echo "<table>\n";
                echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strusername']}</th>\n";
         */
        function doDefault($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                function renderUseExpires($val) {
                        return $val == 'infinity' ? '' : htmlspecialchars($val);
                $actions = array(
                        'alter' => array(
                                'title' => $lang['stralter'],
-                               'url'   => "{$PHP_SELF}?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'   => "{$PHP_SELF}?action=confirm_drop&amp;{$misc->href}&amp;",
+                               'url'   => "users.php?action=confirm_drop&amp;{$misc->href}&amp;",
                                'vars'  => array('username' => 'usename'),
                        ),
                );
                
                $misc->printTable($users, $columns, $actions, $lang['strnousers']);
 
-               echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?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";
 
        }
 
index 5136c2f24b1781e3452304c8ab943ec29aafd073..b277a40a1906e4d707a9fa317303a47810099158 100755 (executable)
@@ -3,7 +3,7 @@
        /**
         * List views in a database
         *
-        * $Id: viewproperties.php,v 1.21.2.1 2007/05/28 17:21:57 ioguix Exp $
+        * $Id: viewproperties.php,v 1.21.2.2 2007/07/09 14:55:22 xzilla Exp $
         */
 
        // Include application functions
@@ -29,7 +29,7 @@
         */
        function doEdit($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $misc->printTrail('view');
                $misc->printTitle($lang['stredit'],'pg.view.alter');
@@ -44,7 +44,7 @@
                                $_POST['formComment'] = $viewdata->f['relcomment'];
                        }
                        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"viewproperties.php\" method=\"post\">\n";
                        echo "<table width=\"100%\">\n";
                        echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strdefinition']}</th>\n";
                        echo "\t\t<td class=\"data1\"><textarea style=\"width: 100%;\" rows=\"20\" cols=\"50\" name=\"formDefinition\" wrap=\"virtual\">", 
@@ -72,7 +72,7 @@
         */
        function doExport($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                $misc->printTrail('view');
                $misc->printTabs('view','export');
         */
        function doDefinition($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
        
                // Get view
                $vdata = $data->getView($_REQUEST['view']);
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
                
-               echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?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";
        }
 
         */
        function doProperties($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
 
                if (!isset($_REQUEST['stage'])) $_REQUEST['stage'] = 1;
 
                                $misc->printTitle($lang['straltercolumn'],'pg.column.alter'); 
                                $misc->printMsg($msg);
 
-                               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                               echo "<form action=\"viewproperties.php\" method=\"post\">\n";
 
                                // Output view header
                                echo "<table>\n";
         */
        function doDefault($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                function attPre(&$rowdata) {
                        global $data;
                $actions = array(
                        'alter' => array(
                                'title' => $lang['stralter'],
-                               'url'   => "{$PHP_SELF}?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'),
                        ),
                );
index a6724c00ad86bf7c830921769c72b7814308ae22..8c6f72b9fc4fa5d0f33a8358ef991151e428adff 100644 (file)
--- a/views.php
+++ b/views.php
@@ -3,7 +3,7 @@
        /**
         * Manage views in a database
         *
-        * $Id: views.php,v 1.60.2.1 2007/05/28 17:21:57 ioguix Exp $
+        * $Id: views.php,v 1.60.2.2 2007/07/09 14:55:22 xzilla Exp $
         */
 
        // Include application functions
@@ -19,7 +19,6 @@
        function doSelectRows($confirm, $msg = '') {
                global $data, $misc, $_no_output;  
                global $lang;
-               global $PHP_SELF;
 
                if ($confirm) {
                        $misc->printTrail('view');
@@ -28,7 +27,7 @@
 
                        $attrs = $data->getTableAttributes($_REQUEST['view']);
 
-                       echo "<form action=\"$PHP_SELF\" method=\"post\" name=\"selectform\">\n";
+                       echo "<form action=\"views.php\" method=\"post\" name=\"selectform\">\n";
                        if ($attrs->recordCount() > 0) {
                                // JavaScript for select all feature
                                echo "<script type=\"text/javascript\">\n";
         */
        function doDrop($confirm) {
                global $data, $misc;
-               global $PHP_SELF, $lang, $_reload_browser;
+               global $lang, $_reload_browser;
 
                if ($confirm) { 
                        $misc->printTrail('view');
                        
                        echo "<p>", sprintf($lang['strconfdropview'], $misc->printVal($_REQUEST['view'])), "</p>\n";
                        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"views.php\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
                        echo "<input type=\"hidden\" name=\"view\" value=\"", htmlspecialchars($_REQUEST['view']), "\" />\n";
                        echo $misc->form;
         */
        function doSetParamsCreate($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                // Check that they've chosen tables for the view definition
                if (!isset($_POST['formTables']) ) doWizardCreate($lang['strviewneedsdef']);
                        }
                        asort($arrFields);
                        
-                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       echo "<form action=\"views.php\" method=\"post\">\n";
                        echo "<table>\n";
                        echo "<tr><th class=\"data\">{$lang['strviewname']}</th></tr>";
                        echo "<tr>\n<td class=\"data1\">\n";
         */
        function doWizardCreate($msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $tables = $data->getTables(true);
                
                $misc->printTitle($lang['strcreateviewwiz'], 'pg.view.create');
                $misc->printMsg($msg);
                
-               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+               echo "<form action=\"views.php\" method=\"post\">\n";
                echo "<table>\n";
                echo "<tr><th class=\"data\">{$lang['strtables']}</th></tr>";           
                echo "<tr>\n<td class=\"data1\">\n";            
         */
        function doCreate($msg = '') {
                global $data, $misc, $conf;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                if (!isset($_REQUEST['formView'])) $_REQUEST['formView'] = '';
                if (!isset($_REQUEST['formDefinition'])) $_REQUEST['formDefinition'] = 'SELECT ';
                $misc->printTitle($lang['strcreateview'], 'pg.view.create');
                $misc->printMsg($msg);
                
-               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+               echo "<form action=\"views.php\" method=\"post\">\n";
                echo "<table width=\"100%\">\n";
                echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strname']}</th>\n";
                echo "\t<td class=\"data1\"><input name=\"formView\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"", 
         */
        function doDefault($msg = '') {
                global $data, $misc, $conf;
-               global $PHP_SELF, $lang;
+               global $lang;
                
                $misc->printTrail('schema');
                $misc->printTabs('schema','views');
                        ),
                        'select' => array(
                                'title' => $lang['strselect'],
-                               'url'   => "{$PHP_SELF}?action=confselectrows&amp;{$misc->href}&amp;",
+                               'url'   => "views.php?action=confselectrows&amp;{$misc->href}&amp;",
                                'vars'  => array('view' => 'relname'),
                        ),
                        
 // Insert is possible if the relevant rule for the view has been created.
 //                     'insert' => array(
 //                             'title' => $lang['strinsert'],
-//                             'url'   => "{$PHP_SELF}?action=confinsertrow&amp;{$misc->href}&amp;",
+//                             'url'   => "views.php?action=confinsertrow&amp;{$misc->href}&amp;",
 //                             'vars'  => array('view' => 'relname'),
 //                     ),
 
                        'drop' => array(
                                'title' => $lang['strdrop'],
-                               'url'   => "{$PHP_SELF}?action=confirm_drop&amp;{$misc->href}&amp;",
+                               'url'   => "views.php?action=confirm_drop&amp;{$misc->href}&amp;",
                                'vars'  => array('view' => 'relname'),
                        ),
                );
                
                $misc->printTable($views, $columns, $actions, $lang['strnoviews']);
                
-               echo "<p><a class=\"navlink\" href=\"$PHP_SELF?action=create&amp;{$misc->href}\">{$lang['strcreateview']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"$PHP_SELF?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";
 
        }