fix xss vulnerability on PHP_SELF
authorioguix <ioguix>
Mon, 28 May 2007 17:21:55 +0000 (17:21 +0000)
committerioguix <ioguix>
Mon, 28 May 2007 17:21:55 +0000 (17:21 +0000)
35 files changed:
aggregates.php
all_db.php
casts.php
colproperties.php
constraints.php
conversions.php
database.php
display.php
domains.php
functions.php
groups.php
indexes.php
info.php
languages.php
libraries/lib.inc.php
login.php
operators.php
plugin_slony.php
privileges.php
reports.php
roles.php
rules.php
schemas.php
sequences.php
servers.php
sql.php
sqledit.php
tables.php
tablespaces.php
tblproperties.php
triggers.php
types.php
users.php
viewproperties.php
views.php

index 3ee6480fc5bf202ecf9c782b98f4874679ebd13b..8c266b92d9b432208585bbdc909375bd2a912176 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage aggregates in a database
         *
-        * $Id: aggregates.php,v 1.17 2007/01/15 15:48:17 soranzo Exp $
+        * $Id: aggregates.php,v 1.15.2.1 2007/05/28 17:21:55 ioguix Exp $
         */
 
        // Include application functions
@@ -11,7 +11,6 @@
        
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
 
        /**
         * Actually creates the new aggregate in the database
@@ -93,7 +92,7 @@
                echo "\t\t<td class=\"data\"><input name=\"sortop\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"", 
                        htmlspecialchars($_REQUEST['sortop']), "\" /></td>\n\t</tr>\n";
                echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strcomment']}</th>\n";
-               echo "\t\t<td><textarea name=\"aggrcomment\" rows=\"3\" cols=\"32\">", 
+               echo "\t\t<td><textarea name=\"aggrcomment\" rows=\"3\" cols=\"32\" wrap=\"virtual\">", 
                        htmlspecialchars($_REQUEST['aggrcomment']), "</textarea></td>\n\t</tr>\n";
 
                echo "</table>\n";
 
                        // Display aggregate's name, owner and schema
                        echo "\t<tr>\n\t\t<td><input name=\"newaggrname\" size=\"32\" maxlength=\"32\" value=\"", htmlspecialchars($_REQUEST['aggrname']), "\" /></td>";
-                       echo "<td><input name=\"newaggrowner\" size=\"32\" maxlength=\"32\" value=\"", htmlspecialchars($aggrdata->fields['usename']), "\" /></td>";
+                       echo "<td><input name=\"newaggrowner\" size=\"32\" maxlength=\"32\" value=\"", htmlspecialchars($aggrdata->f['usename']), "\" /></td>";
                        echo "<td><input name=\"newaggrschema\" size=\"32\" maxlength=\"32\" value=\"", htmlspecialchars($_REQUEST['schema']), "\" /></td>\n\t</tr>\n";
                        echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strcomment']}</th>\n";
-                       echo "\t\t<td><textarea name=\"newaggrcomment\" rows=\"3\" cols=\"32\">", 
-                               htmlspecialchars($aggrdata->fields['aggrcomment']), "</textarea></td>\n\t</tr>\n";
+                       echo "\t\t<td><textarea name=\"newaggrcomment\" rows=\"3\" cols=\"32\" wrap=\"virtual\">", 
+                               htmlspecialchars($aggrdata->f['aggrcomment']), "</textarea></td>\n\t</tr>\n";
                        echo "</table>\n";
                        echo "<p><input type=\"hidden\" name=\"action\" value=\"save_alter\" />\n";
                        echo $misc->form;
                        echo "<input type=\"hidden\" name=\"aggrname\" value=\"", htmlspecialchars($_REQUEST['aggrname']), "\" />\n";
                        echo "<input type=\"hidden\" name=\"aggrtype\" value=\"", htmlspecialchars($_REQUEST['aggrtype']), "\" />\n";
-                       echo "<input type=\"hidden\" name=\"aggrowner\" value=\"", htmlspecialchars($aggrdata->fields['usename']), "\" />\n";
+                       echo "<input type=\"hidden\" name=\"aggrowner\" value=\"", htmlspecialchars($aggrdata->f['usename']), "\" />\n";
                        echo "<input type=\"hidden\" name=\"aggrschema\" value=\"", htmlspecialchars($_REQUEST['schema']), "\" />\n";
-                       echo "<input type=\"hidden\" name=\"aggrcomment\" value=\"", htmlspecialchars($aggrdata->fields['aggrcomment']), "\" />\n";
+                       echo "<input type=\"hidden\" name=\"aggrcomment\" value=\"", htmlspecialchars($aggrdata->f['aggrcomment']), "\" />\n";
                        echo "<input type=\"submit\" name=\"alter\" value=\"{$lang['stralter']}\" />\n";
                        echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" /></p>\n";
                } else {
                        echo "<tr>\n\t<td class=\"data2\">{$lang['straggrbasetype']}</td>\n";
                        echo "\t<td class=\"data2\">", htmlspecialchars($_REQUEST['aggrtype']), "</td>\n</tr>\n";
                        echo "<tr>\n\t<td class=\"data1\">{$lang['straggrsfunc']}</td>\n";
-                       echo "\t<td class=\"data1\">", htmlspecialchars($aggrdata->fields['aggtransfn']), "</td>\n</tr>\n";
+                       echo "\t<td class=\"data1\">", htmlspecialchars($aggrdata->f['aggtransfn']), "</td>\n</tr>\n";
                        echo "<tr>\n\t<td class=\"data2\">{$lang['straggrstype']}</td>\n";
-                       echo "\t<td class=\"data2\">", htmlspecialchars($aggrdata->fields['aggstype']), "</td>\n</tr>\n";
+                       echo "\t<td class=\"data2\">", htmlspecialchars($aggrdata->f['aggstype']), "</td>\n</tr>\n";
                        echo "<tr>\n\t<td class=\"data1\">{$lang['straggrffunc']}</td>\n";
-                       echo "\t<td class=\"data1\">", htmlspecialchars($aggrdata->fields['aggfinalfn']), "</td>\n</tr>\n";
+                       echo "\t<td class=\"data1\">", htmlspecialchars($aggrdata->f['aggfinalfn']), "</td>\n</tr>\n";
                        echo "<tr>\n\t<td class=\"data2\">{$lang['straggrinitcond']}</td>\n";
-                       echo "\t<td class=\"data2\">", htmlspecialchars($aggrdata->fields['agginitval']), "</td>\n</tr>\n";
+                       echo "\t<td class=\"data2\">", htmlspecialchars($aggrdata->f['agginitval']), "</td>\n</tr>\n";
                        echo "<tr>\n\t<td class=\"data1\">{$lang['straggrsortop']}</td>\n";
-                       echo "\t<td class=\"data1\">", htmlspecialchars($aggrdata->fields['aggsortop']), "</td>\n</tr>\n";
+                       echo "\t<td class=\"data1\">", htmlspecialchars($aggrdata->f['aggsortop']), "</td>\n</tr>\n";
                        echo "<tr>\n\t<td class=\"data2\">{$lang['strowner']}</td>\n";
-                       echo "\t<td class=\"data2\">", htmlspecialchars($aggrdata->fields['usename']), "</td>\n</tr>\n";
+                       echo "\t<td class=\"data2\">", htmlspecialchars($aggrdata->f['usename']), "</td>\n</tr>\n";
                        echo "<tr>\n\t<td class=\"data1\">{$lang['strcomment']}</td>\n";
-                       echo "\t<td class=\"data1\">", $misc->printVal($aggrdata->fields['aggrcomment']), "</td>\n</tr>\n";
+                       echo "\t<td class=\"data1\">", $misc->printVal($aggrdata->f['aggrcomment']), "</td>\n</tr>\n";
                        echo "</table>\n";
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
index c08a245158a963f7d28a292bb0c67ae38da285ea..677726c19557f2e353c2f76a65f4f2111fa17e1d 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage databases within a server
         *
-        * $Id: all_db.php,v 1.47 2007/01/10 00:38:48 soranzo Exp $
+        * $Id: all_db.php,v 1.45.2.1 2007/05/28 17:21:55 ioguix Exp $
         */
 
        // Include application functions
@@ -11,7 +11,6 @@
        
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
 
        /**
         * Display a form for alter and perform actual alter
@@ -43,7 +42,7 @@
                                echo "<tr><th class=\"data left required\">{$lang['strowner']}</th>\n";
                                echo "<td class=\"data1\"><select name=\"owner\">";
                                while (!$users->EOF) {
-                                       $uname = $users->fields['usename'];
+                                       $uname = $users->f['usename'];
                                        echo "<option value=\"", htmlspecialchars($uname), "\"",
                                                ($uname == $owner) ? ' selected="selected"' : '', ">", htmlspecialchars($uname), "</option>\n";
                                        $users->moveNext();
@@ -55,7 +54,7 @@
                                $comment = isset($rs->fields['description']) ? $rs->fields['description'] : '';
                                echo "<tr><th class=\"data left\">{$lang['strcomment']}</th>\n";
                                echo "<td class=\"data1\">";
-                               echo "<textarea rows=\"3\" cols=\"32\" name=\"dbcomment\">",
+                               echo "<textarea rows=\"3\" cols=\"32\" name=\"dbcomment\" wrap=\"virtual\">",
                                        htmlspecialchars($comment), "</textarea></td></tr>\n";
                        }
                        echo "</table>\n";
                                ($_POST['formSpc'] == '') ? ' selected="selected"' : '', "></option>\n";
                        // Display all other tablespaces
                        while (!$tablespaces->EOF) {
-                               $spcname = htmlspecialchars($tablespaces->fields['spcname']);
+                               $spcname = htmlspecialchars($tablespaces->f['spcname']);
                                echo "\t\t\t\t<option value=\"{$spcname}\"",
                                        ($spcname == $_POST['formSpc']) ? ' selected="selected"' : '', ">{$spcname}</option>\n";
                                $tablespaces->moveNext();
                // Comments (if available)
                if ($data->hasSharedComments()) {
                        echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strcomment']}</th>\n";
-                       echo "\t\t<td><textarea name=\"formComment\" rows=\"3\" cols=\"32\">", 
+                       echo "\t\t<td><textarea name=\"formComment\" rows=\"3\" cols=\"32\" wrap=\"virtual\">", 
                                htmlspecialchars($_POST['formComment']), "</textarea></td>\n\t</tr>\n";
                }
 
index 410b4ffc4882ccfa612f85c25a7ab0dd69b32a60..b4ccce4d7449a927cb24d17778077c4a75139fa5 100644 (file)
--- a/casts.php
+++ b/casts.php
@@ -3,7 +3,7 @@
        /**
         * Manage casts in a database
         *
-        * $Id: casts.php,v 1.12 2005/11/25 08:49:08 jollytoad Exp $
+        * $Id: casts.php,v 1.12.2.1 2007/05/28 17:21:56 ioguix Exp $
         */
 
        // Include application functions
@@ -11,7 +11,6 @@
        
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
 
        /**
         * Show default list of casts in the database
index 383730fc76504f78f18da2ea9f94ce22f04ea5ee..51562fbb83ce7486300abbc39a07daa941819e7e 100644 (file)
@@ -16,7 +16,6 @@
                $tableName =& $_REQUEST['view'];
        else 
                die("No table provided!");
-       $PHP_SELF = $_SERVER['PHP_SELF'];
 
        /**
         * Displays a screen where they can alter a column
                                echo "<th class=\"data\">{$lang['strnotnull']}</th><th class=\"data\">{$lang['strdefault']}</th><th class=\"data\">{$lang['strcomment']}</th></tr>";
 
                                $column = $data->getTableAttributes($_REQUEST['table'], $_REQUEST['column']);
-                               $column->fields['attnotnull'] = $data->phpBool($column->fields['attnotnull']);
+                               $column->f['attnotnull'] = $data->phpBool($column->f['attnotnull']);
 
                                // Upon first drawing the screen, load the existing column information
                                // from the database.
                                if (!isset($_REQUEST['default'])) {
-                                       $_REQUEST['field'] = $column->fields['attname'];
-                                       $_REQUEST['type'] = $column->fields['base_type'];
+                                       $_REQUEST['field'] = $column->f['attname'];
+                                       $_REQUEST['type'] = $column->f['base_type'];
                                        // Check to see if its' an array type...
                                        // XXX: HACKY
-                                       if (substr($column->fields['base_type'], strlen($column->fields['base_type']) - 2) == '[]') {
-                                               $_REQUEST['type'] = substr($column->fields['base_type'], 0, strlen($column->fields['base_type']) - 2);
+                                       if (substr($column->f['base_type'], strlen($column->f['base_type']) - 2) == '[]') {
+                                               $_REQUEST['type'] = substr($column->f['base_type'], 0, strlen($column->f['base_type']) - 2);
                                                $_REQUEST['array'] = '[]';
                                        }
                                        else {
-                                               $_REQUEST['type'] = $column->fields['base_type'];
+                                               $_REQUEST['type'] = $column->f['base_type'];
                                                $_REQUEST['array'] = '';
                                        }
                                        // To figure out the length, look in the brackets :(
                                        // XXX: HACKY
-                                       if ($column->fields['type'] != $column->fields['base_type'] && ereg('\\(([0-9, ]*)\\)', $column->fields['type'], $bits)) {
+                                       if ($column->f['type'] != $column->f['base_type'] && ereg('\\(([0-9, ]*)\\)', $column->f['type'], $bits)) {
                                                $_REQUEST['length'] = $bits[1];
                                        }
                                        else
                                                $_REQUEST['length'] = '';
-                                       $_REQUEST['default'] = $_REQUEST['olddefault'] = $column->fields['adsrc'];
-                                       if ($column->fields['attnotnull']) $_REQUEST['notnull'] = 'YES';
-                                       $_REQUEST['comment'] = $column->fields['comment'];
+                                       $_REQUEST['default'] = $_REQUEST['olddefault'] = $column->f['adsrc'];
+                                       if ($column->f['attnotnull']) $_REQUEST['notnull'] = 'YES';
+                                       $_REQUEST['comment'] = $column->f['comment'];
                                }                               
 
                                // Column name
@@ -96,7 +95,7 @@
                                                        $misc->printVal($v), "</option>\n";
                                        }
                                        while (!$types->EOF) {
-                                               $typname = $types->fields['typname'];
+                                               $typname = $types->f['typname'];
                                                echo "<option value=\"", htmlspecialchars($typname), "\"", ($typname == $_REQUEST['type']) ? ' selected="selected"' : '', ">",
                                                        $misc->printVal($typname), "</option>\n";
                                                $types->moveNext();
                                                htmlspecialchars($_REQUEST['length']), "\" /></td>";
                                } else {
                                        // Otherwise draw the read-only type name
-                                       echo "<td>", $misc->printVal($data->formatType($column->fields['type'], $column->fields['atttypmod'])), "</td>";
+                                       echo "<td>", $misc->printVal($data->formatType($column->f['type'], $column->f['atttypmod'])), "</td>";
                                }
                                
                                echo "<td><input type=\"checkbox\" name=\"notnull\"", (isset($_REQUEST['notnull'])) ? ' checked="checked"' : '', " /></td>\n";
                                echo "<input type=\"hidden\" name=\"table\" value=\"", htmlspecialchars($_REQUEST['table']), "\" />\n";
                                echo "<input type=\"hidden\" name=\"column\" value=\"", htmlspecialchars($_REQUEST['column']), "\" />\n";
                                echo "<input type=\"hidden\" name=\"olddefault\" value=\"", htmlspecialchars($_REQUEST['olddefault']), "\" />\n";
-                               if ($column->fields['attnotnull']) echo "<input type=\"hidden\" name=\"oldnotnull\" value=\"on\" />\n";
-                               echo "<input type=\"hidden\" name=\"oldtype\" value=\"", htmlspecialchars($data->formatType($column->fields['type'], $column->fields['atttypmod'])), "\" />\n";
+                               if ($column->f['attnotnull']) echo "<input type=\"hidden\" name=\"oldnotnull\" value=\"on\" />\n";
+                               echo "<input type=\"hidden\" name=\"oldtype\" value=\"", htmlspecialchars($data->formatType($column->f['type'], $column->f['atttypmod'])), "\" />\n";
                                // Add hidden variables to suppress error notices if we don't support altering column type
                                if (!$data->hasAlterColumnType()) {
                                        echo "<input type=\"hidden\" name=\"type\" value=\"", htmlspecialchars($_REQUEST['type']), "\" />\n";                           
 
                function attPre(&$rowdata) {
                        global $data;
-                       $rowdata->fields['+type'] = $data->formatType($rowdata->fields['type'], $rowdata->fields['atttypmod']);
+                       $rowdata->f['+type'] = $data->formatType($rowdata->f['type'], $rowdata->f['atttypmod']);
                }
                
                if (empty($_REQUEST['column']))
                        $attrs = $data->getTableAttributes($tableName, $_REQUEST['column']);
 
                        // Show comment if any
-                       if ($attrs->fields['comment'] !== null)
-                               echo "<p class=\"comment\">", $misc->printVal($attrs->fields['comment']), "</p>\n";
+                       if ($attrs->f['comment'] !== null)
+                               echo "<p class=\"comment\">", $misc->printVal($attrs->f['comment']), "</p>\n";
 
                        $column = array(
                                'column' => array(
index fe1d1614705ccd5684b15cd27c5d54dc478a4d5c..1fd06732fbf54a53329829ed03f0ad60bb746030 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * List constraints on a table
         *
-        * $Id: constraints.php,v 1.44 2007/01/15 15:48:17 soranzo Exp $
+        * $Id: constraints.php,v 1.43.2.1 2007/05/28 17:21:56 ioguix Exp $
         */
 
        // Include application functions
@@ -11,7 +11,6 @@
        include_once('./classes/class.select.php');
 
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
 
        /**
         * Confirm and then actually add a FOREIGN KEY constraint
@@ -58,7 +57,7 @@
 
                                        if ($attrs->recordCount() > 0) {
                                                while (!$attrs->EOF) {
-                                                       $selColumns->add(new XHTML_Option($attrs->fields['attname']));
+                                                       $selColumns->add(new XHTML_Option($attrs->f['attname']));
                                                        $attrs->moveNext();
                                                }
                                        }
 
                                if ($attrs->recordCount() > 0) {
                                        while (!$attrs->EOF) {
-                                               $selColumns->add(new XHTML_Option($attrs->fields['attname']));
+                                               $selColumns->add(new XHTML_Option($attrs->f['attname']));
                                                $attrs->moveNext();
                                        }
                                }
                                echo "<tr>";
                                echo "<td class=\"data1\" colspan=\"3\"><select name=\"target\">";
                                while (!$tables->EOF) {
-                                       $key = array('schemaname' => $tables->fields['nspname'], 'tablename' => $tables->fields['relname']);
+                                       $key = array('schemaname' => $tables->f['nspname'], 'tablename' => $tables->f['relname']);
                                        $key = serialize($key);
                                        echo "<option value=\"", htmlspecialchars($key), "\">";
-                                       if ($data->hasSchemas() && $tables->fields['nspname'] != $_REQUEST['schema']) {
-                                                       echo htmlspecialchars($tables->fields['nspname']), '.';
+                                       if ($data->hasSchemas() && $tables->f['nspname'] != $_REQUEST['schema']) {
+                                                       echo htmlspecialchars($tables->f['nspname']), '.';
                                        }
-                                       echo htmlspecialchars($tables->fields['relname']), "</option>\n";
+                                       echo htmlspecialchars($tables->f['relname']), "</option>\n";
                                        $tables->moveNext();    
                                }
                                echo "</select>\n";
        
                        if ($attrs->recordCount() > 0) {
                                while (!$attrs->EOF) {
-                                       $selColumns->add(new XHTML_Option($attrs->fields['attname']));
+                                       $selColumns->add(new XHTML_Option($attrs->f['attname']));
                                        $attrs->moveNext();
                                } 
                        }
                                        ($_POST['tablespace'] == '') ? ' selected="selected"' : '', "></option>\n";
                                // Display all other tablespaces
                                while (!$tablespaces->EOF) {
-                                       $spcname = htmlspecialchars($tablespaces->fields['spcname']);
+                                       $spcname = htmlspecialchars($tablespaces->f['spcname']);
                                        echo "\t\t\t\t<option value=\"{$spcname}\"",
                                                ($spcname == $_POST['tablespace']) ? ' selected="selected"' : '', ">{$spcname}</option>\n";
                                        $tablespaces->moveNext();
 
                function cnPre(&$rowdata) {
                        global $data, $lang;
-                       if (is_null($rowdata->fields['consrc'])) {
-                               $atts = $data->getAttributeNames($_REQUEST['table'], explode(' ', $rowdata->fields['indkey']));
-                               $rowdata->fields['+definition'] = ($rowdata->fields['contype'] == 'u' ? "UNIQUE (" : "PRIMARY KEY (") . join(',', $atts) . ')';
+                       if (is_null($rowdata->f['consrc'])) {
+                               $atts = $data->getAttributeNames($_REQUEST['table'], explode(' ', $rowdata->f['indkey']));
+                               $rowdata->f['+definition'] = ($rowdata->f['contype'] == 'u' ? "UNIQUE (" : "PRIMARY KEY (") . join(',', $atts) . ')';
                        } else {
-                               $rowdata->fields['+definition'] = $rowdata->fields['consrc'];
+                               $rowdata->f['+definition'] = $rowdata->f['consrc'];
                        }
                }
                
index 2c2e255ff116f5934dd0223435f1a4700e629c49..8d996238e67c01d63005f741fe3024329665dbc1 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage conversions in a database
         *
-        * $Id: conversions.php,v 1.12 2005/11/25 08:49:08 jollytoad Exp $
+        * $Id: conversions.php,v 1.12.2.1 2007/05/28 17:21:56 ioguix Exp $
         */
 
        // Include application functions
@@ -11,7 +11,6 @@
        
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
 
        /**
         * Show default list of conversions in the database
index d9439cc5f9aaedb6815dcd817c4a0ac568400ca0..746b7f9736c6804eb399c3d2704ca634a222363a 100755 (executable)
@@ -3,7 +3,7 @@
        /**
         * Manage schemas within a database
         *
-        * $Id: database.php,v 1.88.2.1 2007/03/25 16:13:15 xzilla Exp $
+        * $Id: database.php,v 1.88.2.2 2007/05/28 17:21:56 ioguix Exp $
         */
 
        // Include application functions
@@ -11,7 +11,6 @@
 
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
 
        function _highlight($string, $term) {
                return str_replace($term, "<b>{$term}</b>", $string);
index a2517c414c885657f7852ae4ef618063667d52ef..a7e3062bb2b274e257f2b51538f5e0131094ddf0 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.1 2007/03/03 14:29:53 xzilla Exp $
+        * $Id: display.php,v 1.55.2.2 2007/05/28 17:21:56 ioguix Exp $
         */
 
        // Prevent timeouts on large exports (non-safe mode only)
@@ -21,7 +21,6 @@
        global $conf, $lang;
 
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
 
        /**
         * Show confirmation of edit and perform actual update
index d114dd54bc6db5990e8ba200de1a3f9d9359fb86..f32d613099622cd5a42587c7312780b72488f442 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage domains in a database
         *
-        * $Id: domains.php,v 1.24 2006/06/18 00:02:48 xzilla Exp $
+        * $Id: domains.php,v 1.24.2.1 2007/05/28 17:21:56 ioguix Exp $
         */
 
        // Include application functions
@@ -11,7 +11,6 @@
        
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
        
        /** 
         * Function to save after altering a domain
index 9c805a18f99b5c54ed6d80007e61a354fea2d1bd..d4dee9e7e54b394dad40285e24d4b968a33b5bf6 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage functions in a database
         *
-        * $Id: functions.php,v 1.58 2007/01/02 17:24:44 soranzo Exp $
+        * $Id: functions.php,v 1.56.2.1 2007/05/28 17:21:56 ioguix Exp $
         */
 
        // Include application functions
@@ -11,7 +11,6 @@
        
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
        
        /** 
         * Function to save after editing a function
                                        htmlspecialchars($_POST['formLinkSymbol']), "\" /></td></tr>\n";
                        } else {
                                echo "<tr><th class=\"data required\" colspan=\"4\">{$lang['strdefinition']}</th></tr>\n";
-                               echo "<tr><td class=\"data1\" colspan=\"4\"><textarea style=\"width:100%;\" rows=\"20\" cols=\"50\" name=\"formDefinition\">", 
+                               echo "<tr><td class=\"data1\" colspan=\"4\"><textarea style=\"width:100%;\" rows=\"20\" cols=\"50\" name=\"formDefinition\" wrap=\"virtual\">", 
                                        htmlspecialchars($_POST['formDefinition']), "</textarea></td></tr>\n";
                        }
                        
                        // Display function comment
                        echo "<tr><th class=\"data\" colspan=\"4\">{$lang['strcomment']}</th></tr>\n";
-                       echo "<tr><td class=\"data1\" colspan=\"4\"><textarea style=\"width:100%;\" name=\"formComment\" rows=\"3\" cols=\"50\">", 
+                       echo "<tr><td class=\"data1\" colspan=\"4\"><textarea style=\"width:100%;\" name=\"formComment\" rows=\"3\" cols=\"50\" wrap=\"virtual\">", 
                                        htmlspecialchars($_POST['formComment']), "</textarea></td></tr>\n";
                        // Display function properies
                        if (is_array($data->funcprops) && sizeof($data->funcprops) > 0) {
                echo "{$szJSArguments}\n";
                echo "<tr>\n";
                echo "<th class=\"data required\">{$lang['strargmode']}</th>\n";
-               echo "<th class=\"data required\">{$lang['strname']}</th>\n";
+               echo "<th class=\"data required\">{$lang['strargname']}</th>\n";
                echo "<th class=\"data required\" colspan=\"2\">{$lang['strargtype']}</th>\n";
                echo "</tr>\n";
                echo "{$szJSAddTR}\n";
                                htmlspecialchars($_POST['formLinkSymbol']), "\" /></td></tr>\n";
                } else {
                        echo "<tr><th class=\"data required\" colspan=\"4\">{$lang['strdefinition']}</th></tr>\n";
-                       echo "<tr><td class=\"data1\" colspan=\"4\"><textarea style=\"width:100%;\" rows=\"20\" cols=\"50\" name=\"formDefinition\">", 
+                       echo "<tr><td class=\"data1\" colspan=\"4\"><textarea style=\"width:100%;\" rows=\"20\" cols=\"50\" name=\"formDefinition\" wrap=\"virtual\">", 
                                htmlspecialchars($_POST['formDefinition']), "</textarea></td></tr>\n";
                }
                
index fba7ea2ad8f7b05ab06343982240030cd33100ba..c062f86f1719fa9d159ceba3bc79fcca235ebed2 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage groups in a database cluster
         *
-        * $Id: groups.php,v 1.22 2007/01/15 15:48:17 soranzo Exp $
+        * $Id: groups.php,v 1.21.4.1 2007/05/28 17:21:56 ioguix Exp $
         */
 
        // Include application functions
@@ -11,7 +11,6 @@
 
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
 
        /**
         * Add user to a group
@@ -80,9 +79,9 @@
                $i = 0;
                while (!$groupdata->EOF) {
                                        $id = (($i % 2) == 0 ? '1' : '2');
-               echo "<tr><td class=\"data{$id}\">", $misc->printVal($groupdata->fields['usename']), "</td>\n";
+               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=",
-                                               urlencode($_REQUEST['group']), "&user=", urlencode($groupdata->fields['usename']), "\">{$lang['strdrop']}</a></td>\n";
+                                               urlencode($_REQUEST['group']), "&user=", urlencode($groupdata->f['usename']), "\">{$lang['strdrop']}</a></td>\n";
                echo "</tr>\n";
                $groupdata->moveNext();
                }
@@ -94,7 +93,7 @@
                echo "<form action=\"{$PHP_SELF}\" method=\"post\">\n";
                echo "<select name=\"user\">";
                while (!$users->EOF) {
-                       $uname = $misc->printVal($users->fields['usename']);
+                       $uname = $misc->printVal($users->f['usename']);
                        echo "<option value=\"{$uname}\"",
                                ($uname == $_POST['user']) ? ' selected="selected"' : '', ">{$uname}</option>\n";
                        $users->moveNext();
                        echo "\t\t<td class=\"data\">\n";
                        echo "\t\t\t<select name=\"members[]\" multiple=\"multiple\" size=\"", min(40, $users->recordCount()), "\">\n";
                        while (!$users->EOF) {
-                               $username = $users->fields['usename'];
+                               $username = $users->f['usename'];
                                echo "\t\t\t\t<option value=\"{$username}\"",
                                                (in_array($username, $_POST['members']) ? ' selected="selected"' : ''), ">", $misc->printVal($username), "</option>\n";
                                $users->moveNext();
index da3aa47400cbce8cc386527bffa2ef9c97c0265e..7571b3bf8cfabc7418a55b15bd4c6cf845fa26a3 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * List indexes on a table
         *
-        * $Id: indexes.php,v 1.39 2007/01/15 15:48:17 soranzo Exp $
+        * $Id: indexes.php,v 1.38.2.1 2007/05/28 17:21:56 ioguix Exp $
         */
 
        // Include application functions
@@ -11,7 +11,6 @@
        include_once('./classes/class.select.php');
                
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
 
        /**
         * Show confirmation of cluster index and perform actual cluster
@@ -92,7 +91,7 @@
 
                if ($attrs->recordCount() > 0) {
                        while (!$attrs->EOF) {
-                               $selColumns->add(new XHTML_Option($attrs->fields['attname']));
+                               $selColumns->add(new XHTML_Option($attrs->f['attname']));
                                $attrs->moveNext();
                        }
                }
                                ($_POST['formSpc'] == '') ? ' selected="selected"' : '', "></option>\n";
                        // Display all other tablespaces
                        while (!$tablespaces->EOF) {
-                               $spcname = htmlspecialchars($tablespaces->fields['spcname']);
+                               $spcname = htmlspecialchars($tablespaces->f['spcname']);
                                echo "\t\t\t\t<option value=\"{$spcname}\"",
                                        ($spcname == $_POST['formSpc']) ? ' selected="selected"' : '', ">{$spcname}</option>\n";
                                $tablespaces->moveNext();
                function indPre(&$rowdata, $actions) {
                        global $data, $lang;
                        
-                       if ($data->phpBool($rowdata->fields['indisprimary'])) {
-                               $rowdata->fields['+constraints'] = $lang['strprimarykey'];
+                       if ($data->phpBool($rowdata->f['indisprimary'])) {
+                               $rowdata->f['+constraints'] = $lang['strprimarykey'];
                                $actions['drop']['disable'] = true;
                        }
-                       elseif ($data->phpBool($rowdata->fields['indisunique'])) {
-                               $rowdata->fields['+constraints'] = $lang['struniquekey'];
+                       elseif ($data->phpBool($rowdata->f['indisunique'])) {
+                               $rowdata->f['+constraints'] = $lang['struniquekey'];
                                $actions['drop']['disable'] = true;
                        }
                        else
-                               $rowdata->fields['+constraints'] = '';
+                               $rowdata->f['+constraints'] = '';
                        
                        return $actions;
                }
index c5662dc8ac4119b7449f9aa14b1988bd9b543cdf..4c20683038d97031d72635c08a9c2abb53ffc283 100644 (file)
--- a/info.php
+++ b/info.php
@@ -3,14 +3,13 @@
        /**
         * List extra information on a table
         *
-        * $Id: info.php,v 1.11.4.1 2007/01/27 01:46:25 xzilla Exp $
+        * $Id: info.php,v 1.11.4.2 2007/05/28 17:21:56 ioguix Exp $
         */
 
        // Include application functions
        include_once('./libraries/lib.inc.php');
 
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
 
        /**
         * List all the information on the table
index d692a02f7e48557662ae2db2fe66fe8287b45d75..5908b4f7015bf05a87fc2c6bd8cee89694680e4c 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage languages in a database
         *
-        * $Id: languages.php,v 1.10 2005/11/25 08:49:08 jollytoad Exp $
+        * $Id: languages.php,v 1.10.2.1 2007/05/28 17:21:56 ioguix Exp $
         */
 
        // Include application functions
@@ -11,7 +11,6 @@
        
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
 
        /**
         * Show default list of languages in the database
index 16cd7f6956a5282b47029ed450a4dea6d6264339..4d1bc1077d315e07ed98ddf1d244a7f237398ef8 100644 (file)
@@ -3,8 +3,11 @@
        /**
         * Function library read in upon startup
         *
-        * $Id: lib.inc.php,v 1.111.2.1 2007/03/24 21:24:54 xzilla Exp $
+        * $Id: lib.inc.php,v 1.111.2.2 2007/05/28 17:21:57 ioguix Exp $
         */
+
+       $PHP_SELF = htmlentities($_SERVER['PHP_SELF']);
+
        include_once('./libraries/decorator.inc.php');
        include_once('./lang/translations.php');
        
index 1142c873ab0f05bb8557a9a64e655b3258bf44e9..3720eb438f6961fc6223592957124b905c44a82f 100755 (executable)
--- a/login.php
+++ b/login.php
@@ -3,14 +3,16 @@
        /**
         * Login screen
         *
-        * $Id: login.php,v 1.32 2006/06/17 12:57:36 xzilla Exp $
+        * $Id: login.php,v 1.32.2.1 2007/05/28 17:21:56 ioguix Exp $
         */
        global $conf;
        
        // This needs to be an include once to prevent lib.inc.php infinite recursive includes.
        // 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');
@@ -22,7 +24,7 @@
        if (isset($msg)) $misc->printMsg($msg);
 ?>
 
-<form action="<?php echo $_SERVER['PHP_SELF'] ?>" method="post" name="login_form">
+<form action="<?php echo $PHP_SELF ?>" method="post" name="login_form">
 <?php
        if (!empty($_POST)) $vars =& $_POST;
        else $vars =& $_GET;
index 91bd609a652bd637c6fdd6a044530d900eec09ed..6cf140e1b3130a26954f817419fd42c21a13640f 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage operators in a database
         *
-        * $Id: operators.php,v 1.23 2007/01/15 15:48:17 soranzo Exp $
+        * $Id: operators.php,v 1.22.2.1 2007/05/28 17:21:56 ioguix Exp $
         */
 
        // Include application functions
@@ -11,7 +11,6 @@
        
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
 
        /**
         * Show read only properties for an operator
                $misc->printMsg($msg);
                
                $oprdata = $data->getOperator($_REQUEST['operator_oid']);
-               $oprdata->fields['oprcanhash'] = $data->phpBool($oprdata->fields['oprcanhash']);
+               $oprdata->f['oprcanhash'] = $data->phpBool($oprdata->f['oprcanhash']);
 
                if ($oprdata->recordCount() > 0) {
                        echo "<table>\n";
                        echo "<tr><th class=\"data left\">{$lang['strname']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($oprdata->fields['oprname']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($oprdata->f['oprname']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\">{$lang['strleftarg']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($oprdata->fields['oprleftname']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($oprdata->f['oprleftname']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\">{$lang['strrightarg']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($oprdata->fields['oprrightname']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($oprdata->f['oprrightname']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\">{$lang['strcommutator']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($oprdata->fields['oprcom']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($oprdata->f['oprcom']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\">{$lang['strnegator']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($oprdata->fields['oprnegate']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($oprdata->f['oprnegate']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\">{$lang['strjoin']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($oprdata->fields['oprjoin']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($oprdata->f['oprjoin']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\">{$lang['strhashes']}</th>\n";
-                       echo "<td class=\"data1\">", ($oprdata->fields['oprcanhash']) ? $lang['stryes'] : $lang['strno'], "</td></tr>\n";
+                       echo "<td class=\"data1\">", ($oprdata->f['oprcanhash']) ? $lang['stryes'] : $lang['strno'], "</td></tr>\n";
                        echo "<tr><th class=\"data left\">{$lang['strmerges']}</th>\n";
-                       echo "<td class=\"data1\">", ($oprdata->fields['oprlsortop'] !== '0' && $oprdata->fields['oprrsortop'] !== '0') ? $lang['stryes'] : $lang['strno'], "</td></tr>\n";
+                       echo "<td class=\"data1\">", ($oprdata->f['oprlsortop'] !== '0' && $oprdata->f['oprrsortop'] !== '0') ? $lang['stryes'] : $lang['strno'], "</td></tr>\n";
                        echo "<tr><th class=\"data left\">{$lang['strrestrict']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($oprdata->fields['oprrest']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($oprdata->f['oprrest']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\">{$lang['strleftsort']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($oprdata->fields['oprlsortop']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($oprdata->f['oprlsortop']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\">{$lang['strrightsort']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($oprdata->fields['oprrsortop']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($oprdata->f['oprrsortop']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\">{$lang['strlessthan']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($oprdata->fields['oprltcmpop']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($oprdata->f['oprltcmpop']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\">{$lang['strgreaterthan']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($oprdata->fields['oprgtcmpop']), "</td></tr>\n";
+                       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";
index 4c7b205b88465c7a256473b719e82a1d85d32ea8..b5dc0b54cff380c908caacfb29d1c82cbd66e5cc 100755 (executable)
@@ -3,22 +3,21 @@
        /**
         * Slony database tab plugin
         *
-        * $Id: plugin_slony.php,v 1.15 2007/01/10 02:34:54 soranzo Exp $
+        * $Id: plugin_slony.php,v 1.12.2.1 2007/05/28 17:21:56 ioguix Exp $
         */
 
        // Include application functions
        include_once('./libraries/lib.inc.php');
 
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
 
        // Avoid database connections whenever possible
        switch ($action) {
                case 'clusters_top':
                case 'nodes_top':
                case 'sets_top':
-                       $_no_db_connection = true;
-                       break;
+                               $_no_db_connection = true;
+                               break;
                default:
        }
 
                global $lang;
 
                $misc->printTrail('database');
-               $misc->printTabs('database', 'slony');
+               $misc->printTabs('database','slony');
                $misc->printMsg($msg);
 
                $clusters = $slony->getClusters();
                        echo "<tr><th class=\"data left\" width=\"70\">{$lang['strname']}</th>\n";
                        echo "<td class=\"data1\">", $misc->printVal($slony->slony_cluster), "</td></tr>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">Local Node ID</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($cluster->fields['no_id']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($cluster->f['no_id']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">Local Node</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($cluster->fields['no_comment']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($cluster->f['no_comment']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">Version</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($cluster->fields['version']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($cluster->f['version']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">{$lang['strowner']}</th>\n";
                        echo "<td class=\"data1\">", $misc->printVal($slony->slony_owner), "</td></tr>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">{$lang['strcomment']}</th>\n";
                        echo "\t\t<td class=\"data1\"><input name=\"no_id\" size=\"5\" value=\"",
                                htmlspecialchars($_POST['no_id']), "\" /></td>\n\t</tr>\n";
                        echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strcomment']}</th>\n";
-                       echo "\t\t<td class=\"data1\"><textarea name=\"no_comment\" rows=\"3\" cols=\"32\">", 
+                       echo "\t\t<td class=\"data1\"><textarea name=\"no_comment\" rows=\"3\" cols=\"32\" wrap=\"virtual\">", 
                                htmlspecialchars($_POST['no_comment']), "</textarea></td>\n\t</tr>\n";
                        echo "</table>\n";
                        echo "<p>\n";
                
                if (is_object($node) && $node->recordCount() > 0) {                     
                        // Show comment if any
-                       if ($node->fields['no_comment'] !== null)
-                               echo "<p class=\"comment\">", $misc->printVal($node->fields['no_comment']), "</p>\n";
+                       if ($node->f['no_comment'] !== null)
+                               echo "<p class=\"comment\">", $misc->printVal($node->f['no_comment']), "</p>\n";
 
                        echo "<table>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">{$lang['strname']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($node->fields['no_comment']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($node->f['no_comment']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">{$lang['strid']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($node->fields['no_id']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($node->f['no_id']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">{$lang['stractive']}</th>\n";
-                       echo "<td class=\"data1\">", ($data->phpBool($node->fields['no_active'])) ? $lang['stryes'] : $lang['strno'], "</td></tr>\n";
+                       echo "<td class=\"data1\">", ($data->phpBool($node->f['no_active'])) ? $lang['stryes'] : $lang['strno'], "</td></tr>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">{$lang['strcomment']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($node->fields['no_comment']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($node->f['no_comment']), "</td></tr>\n";
                        echo "</table>\n";
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
                        echo "\t\t<td class=\"data1\"><input name=\"nodeid\" size=\"5\" value=\"",
                                htmlspecialchars($_POST['nodeid']), "\" /></td>\n\t</tr>\n";
                        echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strcomment']}</th>\n";
-                       echo "\t\t<td class=\"data1\"><textarea name=\"nodecomment\" rows=\"3\" cols=\"32\">", 
+                       echo "\t\t<td class=\"data1\"><textarea name=\"nodecomment\" rows=\"3\" cols=\"32\" wrap=\"virtual\">", 
                                htmlspecialchars($_POST['nodecomment']), "</textarea></td>\n\t</tr>\n";
                                
                        echo "\t</tr>\n";
                
                if (is_object($path) && $path->recordCount() > 0) {                     
                        // Show comment if any
-                       if ($path->fields['no_comment'] !== null)
-                               echo "<p class=\"comment\">", $misc->printVal($path->fields['no_comment']), "</p>\n";
+                       if ($path->f['no_comment'] !== null)
+                               echo "<p class=\"comment\">", $misc->printVal($path->f['no_comment']), "</p>\n";
 
                        echo "<table>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">{$lang['strnodename']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($path->fields['no_comment']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($path->f['no_comment']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">{$lang['strnodeid']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($path->fields['no_id']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($path->f['no_id']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">{$lang['strconninfo']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($path->fields['pa_conninfo']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($path->f['pa_conninfo']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">{$lang['strconnretry']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($path->fields['pa_connretry']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($path->f['pa_connretry']), "</td></tr>\n";
                        echo "</table>\n";
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
                        echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strnodename']}</th>\n";
                        echo "\t\t<td class=\"data1\">\n\t\t\t<select name=\"pathserver\">\n";
                        while (!$nodes->EOF) {
-                               echo "\t\t\t\t<option value=\"{$nodes->fields['no_id']}\"",
-                                       ($nodes->fields['no_id'] == $_POST['pathserver']) ? ' selected="selected"' : '', ">", htmlspecialchars($nodes->fields['no_comment']), "</option>\n";
+                               echo "\t\t\t\t<option value=\"{$nodes->f['no_id']}\"",
+                                       ($nodes->f['no_id'] == $_POST['pathserver']) ? ' selected="selected"' : '', ">", htmlspecialchars($nodes->f['no_comment']), "</option>\n";
                                $nodes->moveNext();
                        }
                        echo "\t\t\t</select>\n\t\t</td>\n\t\n";                
                
                if (is_object($listen) && $listen->recordCount() > 0) {                 
                        // Show comment if any
-                       if ($listen->fields['no_comment'] !== null)
-                               echo "<p class=\"comment\">", $misc->printVal($listen->fields['no_comment']), "</p>\n";
+                       if ($listen->f['no_comment'] !== null)
+                               echo "<p class=\"comment\">", $misc->printVal($listen->f['no_comment']), "</p>\n";
 
                        echo "<table>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">Provider</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($listen->fields['no_comment']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($listen->f['no_comment']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">Provider ID</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($listen->fields['li_provider']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($listen->f['li_provider']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">Origin</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($listen->fields['origin']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($listen->f['origin']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">Origin ID</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($listen->fields['li_origin']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($listen->f['li_origin']), "</td></tr>\n";
                        echo "</table>\n";
                }
                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->fields['li_origin']}\">{$lang['strdrop']}</a></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 "\t<tr>\n\t\t<th class=\"data left required\">Origin</th>\n";
                        echo "\t\t<td class=\"data1\">\n\t\t\t<select name=\"listenorigin\">\n";
                        while (!$nodes->EOF) {
-                               echo "\t\t\t\t<option value=\"{$nodes->fields['no_id']}\"",
-                                       ($nodes->fields['no_id'] == $_POST['listenorigin']) ? ' selected="selected"' : '', ">", htmlspecialchars($nodes->fields['no_comment']), "</option>\n";
+                               echo "\t\t\t\t<option value=\"{$nodes->f['no_id']}\"",
+                                       ($nodes->f['no_id'] == $_POST['listenorigin']) ? ' selected="selected"' : '', ">", htmlspecialchars($nodes->f['no_comment']), "</option>\n";
                                $nodes->moveNext();
                        }
                        echo "\t\t\t</select>\n\t\t</td>\n\t\n";
                        echo "\t\t<td class=\"data1\">\n\t\t\t<select name=\"listenprovider\">\n";
                        $nodes->moveFirst();
                        while (!$nodes->EOF) {
-                               echo "\t\t\t\t<option value=\"{$nodes->fields['no_id']}\"",
-                                       ($nodes->fields['no_id'] == $_POST['listenprovider']) ? ' selected="selected"' : '', ">", htmlspecialchars($nodes->fields['no_comment']), "</option>\n";
+                               echo "\t\t\t\t<option value=\"{$nodes->f['no_id']}\"",
+                                       ($nodes->f['no_id'] == $_POST['listenprovider']) ? ' selected="selected"' : '', ">", htmlspecialchars($nodes->f['no_comment']), "</option>\n";
                                $nodes->moveNext();
                        }
                        echo "\t\t\t</select>\n\t\t</td>\n\t\n";                
                
                if (is_object($set) && $set->recordCount() > 0) {                       
                        // Show comment if any
-                       if ($set->fields['set_comment'] !== null)
-                               echo "<p class=\"comment\">", $misc->printVal($set->fields['set_comment']), "</p>\n";
+                       if ($set->f['set_comment'] !== null)
+                               echo "<p class=\"comment\">", $misc->printVal($set->f['set_comment']), "</p>\n";
 
                        echo "<table>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">{$lang['strname']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($set->fields['set_comment']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($set->f['set_comment']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">{$lang['strid']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($set->fields['set_id']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($set->f['set_id']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">{$lang['strlocked']}</th>\n";
-                       echo "<td class=\"data1\">", ($data->phpBool($set->fields['is_locked'])) ? $lang['stryes'] : $lang['strno'], "</td></tr>\n";
+                       echo "<td class=\"data1\">", ($data->phpBool($set->f['is_locked'])) ? $lang['stryes'] : $lang['strno'], "</td></tr>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">Origin ID</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($set->fields['set_origin']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($set->f['set_origin']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">Origin Node</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($set->fields['no_comment']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($set->f['no_comment']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">Subscriptions</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($set->fields['subscriptions']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($set->f['subscriptions']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">{$lang['strcomment']}</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($set->fields['set_comment']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($set->f['set_comment']), "</td></tr>\n";
                        echo "</table>\n";
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
                        echo "\t\t<td class=\"data1\"><input name=\"setid\" size=\"5\" value=\"",
                                htmlspecialchars($_POST['setid']), "\" /></td>\n\t</tr>\n";
                        echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strcomment']}</th>\n";
-                       echo "\t\t<td class=\"data1\"><textarea name=\"setcomment\" rows=\"3\" cols=\"32\">", 
+                       echo "\t\t<td class=\"data1\"><textarea name=\"setcomment\" rows=\"3\" cols=\"32\" wrap=\"virtual\">", 
                                htmlspecialchars($_POST['setcomment']), "</textarea></td>\n\t</tr>\n";
                                
                        echo "\t</tr>\n";
                        echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strmergeinto']}</th>\n";
                        echo "<td class=\"data1\" colspan=\"3\"><select name=\"target\">";
                        while (!$sets->EOF) {
-                               if ($sets->fields['set_id'] != $_REQUEST['set_id']) {
-                                       echo "<option value=\"{$sets->fields['set_id']}\">";
-                                       echo htmlspecialchars($sets->fields['set_comment']), "</option>\n";
+                               if ($sets->f['set_id'] != $_REQUEST['set_id']) {
+                                       echo "<option value=\"{$sets->f['set_id']}\">";
+                                       echo htmlspecialchars($sets->f['set_comment']), "</option>\n";
                                }
                                $sets->moveNext();      
                        }
                        echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strneworigin']}</th>\n";
                        echo "<td class=\"data1\" colspan=\"3\"><select name=\"new_origin\">";
                        while (!$nodes->EOF) {
-                               if ($nodes->fields['no_id'] != $set->fields['set_origin']) {
-                                       echo "<option value=\"{$nodes->fields['no_id']}\">";
-                                       echo htmlspecialchars($nodes->fields['no_comment']), "</option>\n";
+                               if ($nodes->f['no_id'] != $set->f['set_origin']) {
+                                       echo "<option value=\"{$nodes->f['no_id']}\">";
+                                       echo htmlspecialchars($nodes->f['no_comment']), "</option>\n";
                                }
                                $nodes->moveNext();     
                        }
                        echo "<td class=\"data1\" colspan=\"3\"><select name=\"only_on_node\">";
                        echo "<option value=\"0\"></option>\n";
                        while (!$nodes->EOF) {
-                               echo "<option value=\"{$nodes->fields['no_id']}\"", ($_POST['only_on_node'] == $nodes->fields['no_id'] ? ' selected="selected"' : ''), ">";
-                               echo htmlspecialchars($nodes->fields['no_comment']), "</option>\n";
+                               echo "<option value=\"{$nodes->f['no_id']}\"", ($_POST['only_on_node'] == $nodes->f['no_id'] ? ' selected="selected"' : ''), ">";
+                               echo htmlspecialchars($nodes->f['no_comment']), "</option>\n";
                                $nodes->moveNext();     
                        }
                        echo "</select></td></tr>\n";
                        */
                        echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strddlscript']}</th>\n";
-                       echo "\t\t<td class=\"data1\"><textarea name=\"script\" rows=\"20\" cols=\"40\">", 
+                       echo "\t\t<td class=\"data1\"><textarea name=\"script\" rows=\"20\" cols=\"40\" wrap=\"virtual\">", 
                                htmlspecialchars($_POST['script']), "</textarea></td>\n\t</tr>\n";
                        echo "</table>\n";
                        echo "<p>\n";
                                'url'   => "redirect.php?subject=table&amp;{$misc->href}&amp;",
                                'vars'  => array('table' => 'relname', 'schema' => 'nspname'),
                        ),
-                       'drop' => array(
-                               'title' => $lang['strdrop'],
+                       'remove' => array(
+                               'title' => $lang['strremove'],
                                'url'   => "plugin_slony.php?{$misc->href}&amp;action=confirm_drop_table&amp;set_id={$_REQUEST['set_id']}&amp;",
                                'vars'  => array('tab_id' => 'tab_id', 'qualname' => 'qualname'),
                        ),
                                echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strtable']}</th>\n";
                                echo "<td class=\"data1\" colspan=\"3\"><select name=\"target\">";
                                while (!$tables->EOF) {
-                                       $key = array('schemaname' => $tables->fields['nspname'], 'tablename' => $tables->fields['relname']);
+                                       $key = array('schemaname' => $tables->f['nspname'], 'tablename' => $tables->f['relname']);
                                        $key = serialize($key);
                                        echo "<option value=\"", htmlspecialchars($key), "\">";
-                                       echo htmlspecialchars($tables->fields['nspname']), '.';
-                                       echo htmlspecialchars($tables->fields['relname']), "</option>\n";
+                                       echo htmlspecialchars($tables->f['nspname']), '.';
+                                       echo htmlspecialchars($tables->f['relname']), "</option>\n";
                                        $tables->moveNext();    
                                }
                                echo "</select></td></tr>\n";
                                echo "\t\t<td class=\"data1\"><input name=\"tab_id\" size=\"5\" value=\"",
                                        htmlspecialchars($_POST['tab_id']), "\" /></td>\n\t</tr>\n";
                                echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strcomment']}</th>\n";
-                               echo "\t\t<td class=\"data1\"><textarea name=\"comment\" rows=\"3\" cols=\"32\">", 
+                               echo "\t\t<td class=\"data1\"><textarea name=\"comment\" rows=\"3\" cols=\"32\" wrap=\"virtual\">", 
                                        htmlspecialchars($_POST['comment']), "</textarea></td>\n\t</tr>\n";
                                        
                                echo "\t</tr>\n";
 
                                // If only one index and no triggers then jump to next step
                                if ($indexes->recordCount() == 1 && $triggers->recordCount() == 0) {
-                                       $_REQUEST['idxname'] = $indexes->fields['indname'];
+                                       $_REQUEST['idxname'] = $indexes->f['indname'];
                                        $_REQUEST['nspname'] = $_REQUEST['target']['schemaname'];
                                        $_REQUEST['relname'] = $_REQUEST['target']['tablename'];
                                        $_REQUEST['target'] = serialize($_REQUEST['target']);
                                        echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strindex']}</th>\n";
                                        echo "<td class=\"data1\" colspan=\"3\"><select name=\"idxname\">";
                                        while (!$indexes->EOF) {
-                                               echo "<option value=\"", htmlspecialchars($indexes->fields['indname']), "\">";
-                                               echo htmlspecialchars($indexes->fields['indname']), "</option>\n";
+                                               echo "<option value=\"", htmlspecialchars($indexes->f['indname']), "\">";
+                                               echo htmlspecialchars($indexes->f['indname']), "</option>\n";
                                                $indexes->moveNext();   
                                        }
                                        echo "</select></td></tr>\n";
                                }
                                else {
-                                       echo "<input type=\"hidden\" name=\"idxname\" value=\"", htmlspecialchars($indexes->fields['indname']), "\" />\n";
+                                       echo "<input type=\"hidden\" name=\"idxname\" value=\"", htmlspecialchars($indexes->f['indname']), "\" />\n";
                                }
                                if ($triggers->recordCount() > 0) {
                                        echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strtriggers']}</th>\n";
                                        echo "<td class=\"data1\" colspan=\"3\"><p>{$lang['strtabletriggerstoretain']}</p>\n";
                                        while (!$triggers->EOF) {
-                                               echo "<input type=\"checkbox\" id=\"storedtriggers[", htmlspecialchars($triggers->fields['tgname']), "]\" name=\"storedtriggers[", htmlspecialchars($triggers->fields['tgname']), "]\">";
-                                               echo "<label for=\"storedtriggers[", htmlspecialchars($triggers->fields['tgname']), "]\">", htmlspecialchars($triggers->fields['tgname']), "</label><br/>\n";
+                                               echo "<input type=\"checkbox\" id=\"storedtriggers[", htmlspecialchars($triggers->f['tgname']), "]\" name=\"storedtriggers[", htmlspecialchars($triggers->f['tgname']), "]\">";
+                                               echo "<label for=\"storedtriggers[", htmlspecialchars($triggers->f['tgname']), "]\">", htmlspecialchars($triggers->f['tgname']), "</label><br/>\n";
                                                $triggers->moveNext();  
                                        }
                                        echo "</select></td></tr>\n";                                   
                                echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strnewrepset']}</th>\n";
                                echo "<td class=\"data1\" colspan=\"3\"><select name=\"new_set_id\">";
                                while (!$sets->EOF) {
-                                       if ($sets->fields['set_id'] != $_REQUEST['set_id']) {
-                                               echo "<option value=\"{$sets->fields['set_id']}\">";
-                                               echo htmlspecialchars($sets->fields['set_comment']), "</option>\n";
+                                       if ($sets->f['set_id'] != $_REQUEST['set_id']) {
+                                               echo "<option value=\"{$sets->f['set_id']}\">";
+                                               echo htmlspecialchars($sets->f['set_comment']), "</option>\n";
                                        }
                                        $sets->moveNext();      
                                }
         * Show confirmation of drop and perform actual drop of a table from a
         * replication set.
         */
-       function doDropTable($confirm) {
+       function doRemoveTable($confirm) {
                global $slony, $misc;
                global $PHP_SELF, $lang;
 
                if ($confirm) {
                        $misc->printTrail('slony_cluster');
-                       $misc->printTitle($lang['strdrop']);
+                       $misc->printTitle('Remove');
 
                        echo "<p>", sprintf($lang['strconfremovetablefromrepset'], 
                                $misc->printVal($_REQUEST['qualname']), $misc->printVal($_REQUEST['set_id'])), "</p>\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";
                        echo $misc->form;
-                       echo "<input type=\"submit\" name=\"drop\" value=\"{$lang['strdrop']}\" />\n";
+                       echo "<input type=\"submit\" name=\"drop\" value=\"{$lang['strremove']}\" />\n";
                        echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
                        echo "</form>\n";
                }
                else {
-                       $status = $slony->dropTable($_REQUEST['tab_id']);
+                       $status = $slony->removeTable($_REQUEST['tab_id']);
                        if ($status == 0)
                                doTables($lang['strtableremovedfromrepset']);
                        else
                                'url'   => "sequences.php?action=properties&amp;{$misc->href}&amp;",
                                'vars'  => array('sequence' => 'seqname', 'schema' => 'nspname'),
                        ),
-                       'drop' => array(
-                               'title' => $lang['strdrop'],
+                       'remove' => array(
+                               'title' => $lang['strremove'],
                                'url'   => "plugin_slony.php?{$misc->href}&amp;action=confirm_drop_sequence&amp;set_id={$_REQUEST['set_id']}&amp;",
                                'vars'  => array('seq_id' => 'seq_id', 'qualname' => 'qualname'),
                        ),
                                echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strsequence']}</th>\n";
                                echo "<td class=\"data1\" colspan=\"3\"><select name=\"target\">";
                                while (!$sequences->EOF) {
-                                       $key = array('schemaname' => $sequences->fields['nspname'], 'sequencename' => $sequences->fields['seqname']);
+                                       $key = array('schemaname' => $sequences->f['nspname'], 'sequencename' => $sequences->f['seqname']);
                                        $key = serialize($key);
                                        echo "<option value=\"", htmlspecialchars($key), "\">";
-                                       echo htmlspecialchars($sequences->fields['nspname']), '.';
-                                       echo htmlspecialchars($sequences->fields['seqname']), "</option>\n";
+                                       echo htmlspecialchars($sequences->f['nspname']), '.';
+                                       echo htmlspecialchars($sequences->f['seqname']), "</option>\n";
                                        $sequences->moveNext(); 
                                }
                                echo "</select></td></tr>\n";
                                echo "\t\t<td class=\"data1\"><input name=\"seq_id\" size=\"5\" value=\"",
                                        htmlspecialchars($_POST['seq_id']), "\" /></td>\n\t</tr>\n";
                                echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strcomment']}</th>\n";
-                               echo "\t\t<td class=\"data1\"><textarea name=\"comment\" rows=\"3\" cols=\"32\">", 
+                               echo "\t\t<td class=\"data1\"><textarea name=\"comment\" rows=\"3\" cols=\"32\" wrap=\"virtual\">", 
                                        htmlspecialchars($_POST['comment']), "</textarea></td>\n\t</tr>\n";
                                        
                                echo "\t</tr>\n";
         * Show confirmation of drop and perform actual drop of a sequence from a
         * replication set.
         */
-       function doDropSequence($confirm) {
+       function doRemoveSequence($confirm) {
                global $slony, $misc;
                global $PHP_SELF, $lang;
 
                if ($confirm) {
                        $misc->printTrail('slony_cluster');
-                       $misc->printTitle($lang['strdrop']);
+                       $misc->printTitle($lang['strremove']);
 
                        echo "<p>", sprintf($lang['strconfremovesequencefromrepset'], 
                                $misc->printVal($_REQUEST['qualname']), $misc->printVal($_REQUEST['set_id'])), "</p>\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";
                        echo $misc->form;
-                       echo "<input type=\"submit\" name=\"drop\" value=\"{$lang['strdrop']}\" />\n";
+                       echo "<input type=\"submit\" name=\"drop\" value=\"{$lang['strremove']}\" />\n";
                        echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
                        echo "</form>\n";
                }
                else {
-                       $status = $slony->dropSequence($_REQUEST['seq_id']);
+                       $status = $slony->removeSequence($_REQUEST['seq_id']);
                        if ($status == 0)
                                doSequences($lang['strsequenceremovedfromrepset']);
                        else
                                echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strnewrepset']}</th>\n";
                                echo "<td class=\"data1\" colspan=\"3\"><select name=\"new_set_id\">";
                                while (!$sets->EOF) {
-                                       if ($sets->fields['set_id'] != $_REQUEST['set_id']) {
-                                               echo "<option value=\"{$sets->fields['set_id']}\">";
-                                               echo htmlspecialchars($sets->fields['set_comment']), "</option>\n";
+                                       if ($sets->f['set_id'] != $_REQUEST['set_id']) {
+                                               echo "<option value=\"{$sets->f['set_id']}\">";
+                                               echo htmlspecialchars($sets->f['set_comment']), "</option>\n";
                                        }
                                        $sets->moveNext();      
                                }
                
                if (is_object($subscription) && $subscription->recordCount() > 0) {                     
                        // Show comment if any
-                       if ($subscription->fields['receiver'] !== null)
-                               echo "<p class=\"comment\">", $misc->printVal($subscription->fields['receiver']), "</p>\n";
+                       if ($subscription->f['receiver'] !== null)
+                               echo "<p class=\"comment\">", $misc->printVal($subscription->f['receiver']), "</p>\n";
 
                        echo "<table>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">Provider ID</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($subscription->fields['sub_provider']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($subscription->f['sub_provider']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">Provider Name</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($subscription->fields['provider']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($subscription->f['provider']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">Receiver ID</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($subscription->fields['sub_receiver']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($subscription->f['sub_receiver']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">Receiver Name</th>\n";
-                       echo "<td class=\"data1\">", $misc->printVal($subscription->fields['receiver']), "</td></tr>\n";
+                       echo "<td class=\"data1\">", $misc->printVal($subscription->f['receiver']), "</td></tr>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">{$lang['stractive']}</th>\n";
-                       echo "<td class=\"data1\">", ($data->phpBool($subscription->fields['sub_active'])) ? $lang['stryes'] : $lang['strno'], "</td></tr>\n";
+                       echo "<td class=\"data1\">", ($data->phpBool($subscription->f['sub_active'])) ? $lang['stryes'] : $lang['strno'], "</td></tr>\n";
                        echo "<tr><th class=\"data left\" width=\"70\">May Forward</th>\n";
-                       echo "<td class=\"data1\">", ($data->phpBool($subscription->fields['sub_forward'])) ? $lang['stryes'] : $lang['strno'], "</td></tr>\n";
+                       echo "<td class=\"data1\">", ($data->phpBool($subscription->f['sub_forward'])) ? $lang['stryes'] : $lang['strno'], "</td></tr>\n";
                        echo "</table>\n";
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
                        break;
                case 'drop_table':
                        if (isset($_POST['cancel'])) doTables();
-                       else doDropTable(false);
+                       else doRemoveTable(false);
                        break;
                case 'confirm_drop_table':
-                       doDropTable(true);
+                       doRemoveTable(true);
                        break;
                case 'move_table':
                        if (isset($_REQUEST['cancel'])) doTables();
                        break;
                case 'drop_sequence':
                        if (isset($_POST['cancel'])) doSequences();
-                       else doDropSequence(false);
+                       else doRemoveSequence(false);
                        break;
                case 'confirm_drop_sequence':
-                       doDropSequence(true);
+                       doRemoveSequence(true);
                        break;
                case 'move_sequence':
                        if (isset($_REQUEST['cancel'])) doSequences();
index b60a63332d26107c56f146759768c12d99e826d7..a03f87e21c36f12e965902325b5874524ed7b0e0 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage privileges in a database
         *
-        * $Id: privileges.php,v 1.40 2007/01/15 15:48:17 soranzo Exp $
+        * $Id: privileges.php,v 1.39.2.1 2007/05/28 17:21:56 ioguix Exp $
         */
 
        // Include application functions
@@ -11,7 +11,6 @@
        
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
 
        /**
         * Grant permissions on an object to a user
@@ -50,9 +49,9 @@
                        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";
                        while (!$users->EOF) {
-                               $uname = htmlspecialchars($users->fields['usename']);
+                               $uname = htmlspecialchars($users->f['usename']);
                                echo "<option value=\"{$uname}\"",
-                                       in_array($users->fields['usename'], $_REQUEST['username']) ? ' selected="selected"' : '', ">{$uname}</option>\n";
+                                       in_array($users->f['usename'], $_REQUEST['username']) ? ' selected="selected"' : '', ">{$uname}</option>\n";
                                $users->moveNext();
                        }
                        echo "</select></td></tr>\n";
@@ -63,9 +62,9 @@
                        if ($groups->recordCount() > 0) {
                                echo "<br /><select name=\"groupname[]\" multiple=\"multiple\" size=\"", min(6, $groups->recordCount()), "\">\n";
                                while (!$groups->EOF) {
-                                       $gname = htmlspecialchars($groups->fields['groname']);
+                                       $gname = htmlspecialchars($groups->f['groname']);
                                        echo "<option value=\"{$gname}\"",
-                                               in_array($groups->fields['groname'], $_REQUEST['groupname']) ? ' selected="selected"' : '', ">{$gname}</option>\n";
+                                               in_array($groups->f['groname'], $_REQUEST['groupname']) ? ' selected="selected"' : '', ">{$gname}</option>\n";
                                        $groups->moveNext();
                                }
                                echo "</select>\n";
index 41096a9001d50f566ba7f0ec6497b3d7febecd0e..8ba3ed6955e9c26e8b3681a6377d137eb7a07ae1 100644 (file)
@@ -3,14 +3,13 @@
        /**
         * List reports in a database
         *
-        * $Id: reports.php,v 1.23 2007/01/02 17:24:44 soranzo Exp $
+        * $Id: reports.php,v 1.22.4.1 2007/05/28 17:21:56 ioguix Exp $
         */
 
        // Include application functions
        include_once('./libraries/lib.inc.php');
 
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
 
        /**
         * Displays a screen where they can edit a report
                }
                echo "</select></td></tr>\n";
                echo "<tr><th class=\"data left\">{$lang['strcomment']}</th>\n";
-               echo "<td class=\"data1\"><textarea style=\"width:100%;\" rows=\"5\" cols=\"50\" name=\"descr\">",
+               echo "<td class=\"data1\"><textarea style=\"width:100%;\" rows=\"5\" cols=\"50\" name=\"descr\" wrap=\"virtual\">",
                        htmlspecialchars($_POST['descr']), "</textarea></td></tr>\n";
                echo "<tr><th class=\"data left required\">{$lang['strsql']}</th>\n";
-               echo "<td class=\"data1\"><textarea style=\"width:100%;\" rows=\"15\" cols=\"50\" name=\"report_sql\">",
+               echo "<td class=\"data1\"><textarea style=\"width:100%;\" rows=\"15\" cols=\"50\" name=\"report_sql\" wrap=\"virtual\">",
                        htmlspecialchars($_POST['report_sql']), "</textarea></td></tr>\n";
                echo "</table>\n";
                echo "<p><input type=\"hidden\" name=\"action\" value=\"save_edit\" />\n";
                }
                echo "</select></td></tr>\n";
                echo "<tr><th class=\"data left\">{$lang['strcomment']}</th>\n";
-               echo "<td class=\"data1\"><textarea style=\"width:100%;\" rows=\"5\" cols=\"50\" name=\"descr\">",
+               echo "<td class=\"data1\"><textarea style=\"width:100%;\" rows=\"5\" cols=\"50\" name=\"descr\" wrap=\"virtual\">",
                        htmlspecialchars($_REQUEST['descr']), "</textarea></td></tr>\n";
                echo "<tr><th class=\"data left required\">{$lang['strsql']}</th>\n";
-               echo "<td class=\"data1\"><textarea style=\"width:100%;\" rows=\"15\" cols=\"50\" name=\"report_sql\">",
+               echo "<td class=\"data1\"><textarea style=\"width:100%;\" rows=\"15\" cols=\"50\" name=\"report_sql\" wrap=\"virtual\">",
                        htmlspecialchars($_REQUEST['report_sql']), "</textarea></td></tr>\n";
                echo "</table>\n";
                echo "<p><input type=\"hidden\" name=\"action\" value=\"save_create\" />\n";
index 2ea306a8fbb56165409b90f43f1368d100587d17..f8c775a2323beabf21620c70167d7292634cd0da 100644 (file)
--- a/roles.php
+++ b/roles.php
@@ -11,7 +11,6 @@
 
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
        
        /**
         * Displays a screen for create a new role
@@ -36,7 +35,7 @@
                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                echo $misc->form;
                echo "<table>\n";
-               echo "\t<tr>\n\t\t<th class=\"data left required\" width=\"130\">{$lang['strname']}</th>\n";
+               echo "\t<tr>\n\t\t<th class=\"data left required\" width=\"130\">{$lang['strrolename']}</th>\n";
                echo "\t\t<td class=\"data1\"><input size=\"15\" maxlength=\"15\" name=\"formRolename\" value=\"", htmlspecialchars($_POST['formRolename']), "\" /></td>\n\t</tr>\n";
                echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strpassword']}</th>\n";
                echo "\t\t<td class=\"data1\"><input size=\"15\" maxlength=\"32\" type=\"password\" name=\"formPassword\" value=\"", htmlspecialchars($_POST['formPassword']), "\" /></td>\n\t</tr>\n";
@@ -68,7 +67,7 @@
                        echo "\t\t<td class=\"data\">\n";
                        echo "\t\t\t<select name=\"memberof[]\" multiple=\"multiple\" size=\"", min(20, $roles->recordCount()), "\">\n";
                        while (!$roles->EOF) {
-                               $rolename = $roles->fields['rolname'];
+                               $rolename = $roles->f['rolname'];
                                echo "\t\t\t\t<option value=\"{$rolename}\"",
                                (in_array($rolename, $_POST['memberof']) ? ' selected="selected"' : ''), ">", $misc->printVal($rolename), "</option>\n";
                                $roles->moveNext();
@@ -81,7 +80,7 @@
                        echo "\t\t<td class=\"data\">\n";
                        echo "\t\t\t<select name=\"members[]\" multiple=\"multiple\" size=\"", min(20, $roles->recordCount()), "\">\n";
                        while (!$roles->EOF) {
-                               $rolename = $roles->fields['rolname'];
+                               $rolename = $roles->f['rolname'];
                                echo "\t\t\t\t<option value=\"{$rolename}\"",
                                (in_array($rolename, $_POST['members']) ? ' selected="selected"' : ''), ">", $misc->printVal($rolename), "</option>\n";
                                $roles->moveNext();
@@ -94,7 +93,7 @@
                        echo "\t\t<td class=\"data\">\n";
                        echo "\t\t\t<select name=\"adminmembers[]\" multiple=\"multiple\" size=\"", min(20, $roles->recordCount()), "\">\n";
                        while (!$roles->EOF) {
-                               $rolename = $roles->fields['rolname'];
+                               $rolename = $roles->f['rolname'];
                                echo "\t\t\t\t<option value=\"{$rolename}\"",
                                (in_array($rolename, $_POST['adminmembers']) ? ' selected="selected"' : ''), ">", $misc->printVal($rolename), "</option>\n";
                                $roles->moveNext();
                if ($roledata->recordCount() > 0) {
                        $server_info = $misc->getServerInfo();
                        $canRename = $data->hasUserRename() && ($_REQUEST['rolename'] != $server_info['username']);
-                       $roledata->fields['rolsuper'] = $data->phpBool($roledata->fields['rolsuper']);
-                       $roledata->fields['rolcreatedb'] = $data->phpBool($roledata->fields['rolcreatedb']);
-                       $roledata->fields['rolcreaterole'] = $data->phpBool($roledata->fields['rolcreaterole']);
-                       $roledata->fields['rolinherit'] = $data->phpBool($roledata->fields['rolinherit']);
-                       $roledata->fields['rolcanlogin'] = $data->phpBool($roledata->fields['rolcanlogin']);
+                       $roledata->f['rolsuper'] = $data->phpBool($roledata->f['rolsuper']);
+                       $roledata->f['rolcreatedb'] = $data->phpBool($roledata->f['rolcreatedb']);
+                       $roledata->f['rolcreaterole'] = $data->phpBool($roledata->f['rolcreaterole']);
+                       $roledata->f['rolinherit'] = $data->phpBool($roledata->f['rolinherit']);
+                       $roledata->f['rolcanlogin'] = $data->phpBool($roledata->f['rolcanlogin']);
 
                        if (!isset($_POST['formExpires'])){
-                               if ($canRename) $_POST['formNewRoleName'] = $roledata->fields['rolname'];
-                               if ($roledata->fields['rolsuper']) $_POST['formSuper'] = '';
-                               if ($roledata->fields['rolcreatedb']) $_POST['formCreateDB'] = '';
-                               if ($roledata->fields['rolcreaterole']) $_POST['formCreateRole'] = '';
-                               if ($roledata->fields['rolinherit']) $_POST['formInherits'] = '';
-                               if ($roledata->fields['rolcanlogin']) $_POST['formCanLogin'] = '';
-                               $_POST['formConnLimit'] = $roledata->fields['rolconnlimit'] == '-1' ? '' : $roledata->fields['rolconnlimit'];
-                               $_POST['formExpires'] = $roledata->fields['rolvaliduntil'] == 'infinity' ? '' : $roledata->fields['rolvaliduntil'];
+                               if ($canRename) $_POST['formNewRoleName'] = $roledata->f['rolname'];
+                               if ($roledata->f['rolsuper']) $_POST['formSuper'] = '';
+                               if ($roledata->f['rolcreatedb']) $_POST['formCreateDB'] = '';
+                               if ($roledata->f['rolcreaterole']) $_POST['formCreateRole'] = '';
+                               if ($roledata->f['rolinherit']) $_POST['formInherits'] = '';
+                               if ($roledata->f['rolcanlogin']) $_POST['formCanLogin'] = '';
+                               $_POST['formConnLimit'] = $roledata->f['rolconnlimit'] == '-1' ? '' : $roledata->f['rolconnlimit'];
+                               $_POST['formExpires'] = $roledata->f['rolvaliduntil'] == 'infinity' ? '' : $roledata->f['rolvaliduntil'];
                                $_POST['formPassword'] = '';
                        }
                
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                        echo $misc->form;
                        echo "<table>\n";
-                       echo "\t<tr>\n\t\t<th class=\"data left\" width=\"130\">{$lang['strname']}</th>\n";
-                       echo "\t\t<td class=\"data1\">", ($canRename ? "<input name=\"formNewRoleName\" size=\"15\" maxlength=\"15\" value=\"" . htmlspecialchars($_POST['formNewRoleName']) . "\" />" : $misc->printVal($roledata->fields['rolname'])), "</td>\n\t</tr>\n";
+                       echo "\t<tr>\n\t\t<th class=\"data left\" width=\"130\">{$lang['strrolename']}</th>\n";
+                       echo "\t\t<td class=\"data1\">", ($canRename ? "<input name=\"formNewRoleName\" size=\"15\" maxlength=\"15\" value=\"" . htmlspecialchars($_POST['formNewRoleName']) . "\" />" : $misc->printVal($roledata->f['rolname'])), "</td>\n\t</tr>\n";
                        echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strpassword']}</th>\n";
                        echo "\t\t<td class=\"data1\"><input type=\"password\" size=\"15\" maxlength=\"32\" name=\"formPassword\" value=\"", htmlspecialchars($_POST['formPassword']), "\" /></td>\n\t</tr>\n";
                        echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strconfirm']}</th>\n";
                                if ($memberof->recordCount() > 0) {
                                        $i = 0;
                                        while (!$memberof->EOF) {
-                                               $_POST['memberof'][$i++] = $memberof->fields['rolname'];
+                                               $_POST['memberof'][$i++] = $memberof->f['rolname'];
                                                $memberof->moveNext();
                                        }
                                }
                                if ($members->recordCount() > 0) {
                                        $i = 0;
                                        while (!$members->EOF) {
-                                               $_POST['members'][$i++] = $members->fields['rolname'];
+                                               $_POST['members'][$i++] = $members->f['rolname'];
                                                $members->moveNext();
                                        }
                                }
                                if ($adminmembers->recordCount() > 0) {
                                        $i = 0;
                                        while (!$adminmembers->EOF) {
-                                               $_POST['adminmembers'][$i++] = $adminmembers->fields['rolname'];
+                                               $_POST['adminmembers'][$i++] = $adminmembers->f['rolname'];
                                                $adminmembers->moveNext();
                                        }
                                }
                                echo "\t\t<td class=\"data\">\n";
                                echo "\t\t\t<select name=\"memberof[]\" multiple=\"multiple\" size=\"", min(20, $roles->recordCount()), "\">\n";
                                while (!$roles->EOF) {
-                                       $rolename = $roles->fields['rolname'];
+                                       $rolename = $roles->f['rolname'];
                                        echo "\t\t\t\t<option value=\"{$rolename}\"",
                                        (in_array($rolename, $_POST['memberof']) ? ' selected="selected"' : ''), ">", $misc->printVal($rolename), "</option>\n";
                                        $roles->moveNext();
                                echo "\t\t<td class=\"data\">\n";
                                echo "\t\t\t<select name=\"members[]\" multiple=\"multiple\" size=\"", min(20, $roles->recordCount()), "\">\n";
                                while (!$roles->EOF) {
-                                       $rolename = $roles->fields['rolname'];
+                                       $rolename = $roles->f['rolname'];
                                        echo "\t\t\t\t<option value=\"{$rolename}\"",
                                        (in_array($rolename, $_POST['members']) ? ' selected="selected"' : ''), ">", $misc->printVal($rolename), "</option>\n";
                                        $roles->moveNext();
                                echo "\t\t<td class=\"data\">\n";
                                echo "\t\t\t<select name=\"adminmembers[]\" multiple=\"multiple\" size=\"", min(20, $roles->recordCount()), "\">\n";
                                while (!$roles->EOF) {
-                                       $rolename = $roles->fields['rolname'];
+                                       $rolename = $roles->f['rolname'];
                                        echo "\t\t\t\t<option value=\"{$rolename}\"",
                                        (in_array($rolename, $_POST['adminmembers']) ? ' selected="selected"' : ''), ">", $misc->printVal($rolename), "</option>\n";
                                        $roles->moveNext();
                        if (isset($_POST['formNewRoleName'])) $status = $data->setRenameRole($_POST['rolename'], $_POST['formPassword'], isset($_POST['formSuper']), isset($_POST['formCreateDB']), isset($_POST['formCreateRole']), isset($_POST['formInherits']), isset($_POST['formCanLogin']), $_POST['formConnLimit'], $_POST['formExpires'], $_POST['memberof'], $_POST['members'], $_POST['adminmembers'], $_POST['memberofold'], $_POST['membersold'], $_POST['adminmembersold'], $_POST['formNewRoleName']);
                        else $status = $data->setRole($_POST['rolename'], $_POST['formPassword'], isset($_POST['formSuper']), isset($_POST['formCreateDB']), isset($_POST['formCreateRole']), isset($_POST['formInherits']), isset($_POST['formCanLogin']), $_POST['formConnLimit'], $_POST['formExpires'], $_POST['memberof'], $_POST['members'], $_POST['adminmembers'], $_POST['memberofold'], $_POST['membersold'], $_POST['adminmembersold']);
                        if ($status == 0)
-                               doDefault($lang['strrolealtered']);
+                               doDefault($lang['strroleupdated']);
                        else
-                               doAlter($lang['strrolealteredbad']);
+                               doAlter($lang['strroleupdatedbad']);
                }
        }
 
                        
                $roledata = $data->getRole($_REQUEST['rolename']);
                if($roledata->recordCount() > 0 ) {
-                       $roledata->fields['rolsuper'] = $data->phpBool($roledata->fields['rolsuper']);
-                       $roledata->fields['rolcreatedb'] = $data->phpBool($roledata->fields['rolcreatedb']);
-                       $roledata->fields['rolcreaterole'] = $data->phpBool($roledata->fields['rolcreaterole']);
-                       $roledata->fields['rolinherit'] = $data->phpBool($roledata->fields['rolinherit']);
-                       $roledata->fields['rolcanlogin'] = $data->phpBool($roledata->fields['rolcanlogin']);
+                       $roledata->f['rolsuper'] = $data->phpBool($roledata->f['rolsuper']);
+                       $roledata->f['rolcreatedb'] = $data->phpBool($roledata->f['rolcreatedb']);
+                       $roledata->f['rolcreaterole'] = $data->phpBool($roledata->f['rolcreaterole']);
+                       $roledata->f['rolinherit'] = $data->phpBool($roledata->f['rolinherit']);
+                       $roledata->f['rolcanlogin'] = $data->phpBool($roledata->f['rolcanlogin']);
 
                        echo "<table>\n";
                        echo "\t<tr>\n\t\t<th class=\"data\" width=\"130\">Description</th>\n";
                        echo "\t\t<th class=\"data\" width=\"120\">Value</th>\n\t</tr>\n";
-                       echo "\t<tr>\n\t\t<td class=\"data1\">{$lang['strname']}</td>\n";
+                       echo "\t<tr>\n\t\t<td class=\"data1\">{$lang['strrolename']}</td>\n";
                        echo "\t\t<td class=\"data1\">", htmlspecialchars($_REQUEST['rolename']), "</td>\n\t</tr>\n";
                        echo "\t<tr>\n\t\t<td class=\"data2\">{$lang['strsuper']}</td>\n";
-                       echo "\t\t<td class=\"data2\">", (($roledata->fields['rolsuper']) ? $lang['stryes'] : $lang['strno']), "</td>\n\t</tr>\n";
+                       echo "\t\t<td class=\"data2\">", (($roledata->f['rolsuper']) ? $lang['stryes'] : $lang['strno']), "</td>\n\t</tr>\n";
                        echo "\t<tr>\n\t\t<td class=\"data1\">{$lang['strcreatedb']}</td>\n";
-                       echo "\t\t<td class=\"data1\">", (($roledata->fields['rolcreatedb']) ? $lang['stryes'] : $lang['strno']), "</td>\n";
+                       echo "\t\t<td class=\"data1\">", (($roledata->f['rolcreatedb']) ? $lang['stryes'] : $lang['strno']), "</td>\n";
                        echo "\t<tr>\n\t\t<td class=\"data2\">{$lang['strcancreaterole']}</td>\n";
-                       echo "\t\t<td class=\"data2\">", (($roledata->fields['rolcreaterole']) ? $lang['stryes'] : $lang['strno']), "</td>\n";
+                       echo "\t\t<td class=\"data2\">", (($roledata->f['rolcreaterole']) ? $lang['stryes'] : $lang['strno']), "</td>\n";
                        echo "\t<tr>\n\t\t<td class=\"data1\">{$lang['strinheritsprivs']}</td>\n";
-                       echo "\t\t<td class=\"data1\">", (($roledata->fields['rolinherit']) ? $lang['stryes'] : $lang['strno']), "</td>\n";
+                       echo "\t\t<td class=\"data1\">", (($roledata->f['rolinherit']) ? $lang['stryes'] : $lang['strno']), "</td>\n";
                        echo "\t<tr>\n\t\t<td class=\"data2\">{$lang['strcanlogin']}</td>\n";
-                       echo "\t\t<td class=\"data2\">", (($roledata->fields['rolcanlogin']) ? $lang['stryes'] : $lang['strno']), "</td>\n";
+                       echo "\t\t<td class=\"data2\">", (($roledata->f['rolcanlogin']) ? $lang['stryes'] : $lang['strno']), "</td>\n";
                        echo "\t<tr>\n\t\t<td class=\"data1\">{$lang['strconnlimit']}</td>\n";
-                       echo "\t\t<td class=\"data1\">", ($roledata->fields['rolconnlimit'] == '-1' ? $lang['strnolimit'] : $misc->printVal($roledata->fields['rolconnlimit'])), "</td>\n";
+                       echo "\t\t<td class=\"data1\">", ($roledata->f['rolconnlimit'] == '-1' ? $lang['strnolimit'] : $misc->printVal($roledata->f['rolconnlimit'])), "</td>\n";
                        echo "\t<tr>\n\t\t<td class=\"data2\">{$lang['strexpires']}</td>\n";
-                       echo "\t\t<td class=\"data2\">", ($roledata->fields['rolvaliduntil'] == 'infinity' || is_null($roledata->fields['rolvaliduntil']) ? $lang['strnever'] : $misc->printVal($roledata->fields['rolvaliduntil'])), "</td>\n";
+                       echo "\t\t<td class=\"data2\">", ($roledata->f['rolvaliduntil'] == 'infinity' ? $lang['strnever'] : $misc->printVal($roledata->f['rolvaliduntil'])), "</td>\n";
                        echo "\t<tr>\n\t\t<td class=\"data1\">{$lang['strsessiondefaults']}</td>\n";
-                       echo "\t\t<td class=\"data1\">", $misc->printVal($roledata->fields['rolconfig']), "</td>\n";
+                       echo "\t\t<td class=\"data1\">", $misc->printVal($roledata->f['rolconfig']), "</td>\n";
                        echo "\t<tr>\n\t\t<td class=\"data2\">{$lang['strmemberof']}</td>\n";
                        echo "\t\t<td class=\"data2\">";
                        $memberof = $data->getMemberOf($_REQUEST['rolename']);
                        if ($memberof->recordCount() > 0) {     
                                while (!$memberof->EOF) {
-                                       echo $misc->printVal($memberof->fields['rolname']), "<br />\n";
+                                       echo $misc->printVal($memberof->f['rolname']), "<br />\n";
                                        $memberof->moveNext();
                                }
                        }
                        $members = $data->getMembers($_REQUEST['rolename']);
                        if ($members->recordCount() > 0) {
                                while (!$members->EOF) {
-                                       echo $misc->printVal($members->fields['rolname']), "<br />\n";
+                                       echo $misc->printVal($members->f['rolname']), "<br />\n";
                                        $members->moveNext();
                                }
                        }
                        $adminmembers = $data->getMembers($_REQUEST['rolename'], 't');
                        if ($adminmembers->recordCount() > 0) {
                                while (!$adminmembers->EOF) {
-                                       echo $misc->printVal($adminmembers->fields['rolname']), "<br />\n";
+                                       echo $misc->printVal($adminmembers->f['rolname']), "<br />\n";
                                        $adminmembers->moveNext();
                                }
                        }
                $misc->printMsg($msg);
 
                if ($roledata->recordCount() > 0) {
-                       $roledata->fields['rolsuper'] = $data->phpBool($roledata->fields['rolsuper']);
-                       $roledata->fields['rolcreatedb'] = $data->phpBool($roledata->fields['rolcreatedb']);
-                       $roledata->fields['rolcreaterole'] = $data->phpBool($roledata->fields['rolcreaterole']);
-                       $roledata->fields['rolinherit'] = $data->phpBool($roledata->fields['rolinherit']);
+                       $roledata->f['rolsuper'] = $data->phpBool($roledata->f['rolsuper']);
+                       $roledata->f['rolcreatedb'] = $data->phpBool($roledata->f['rolcreatedb']);
+                       $roledata->f['rolcreaterole'] = $data->phpBool($roledata->f['rolcreaterole']);
+                       $roledata->f['rolinherit'] = $data->phpBool($roledata->f['rolinherit']);
                        echo "<table>\n";
-                       echo "\t<tr>\n\t\t<th class=\"data\">{$lang['strname']}</th>\n";
+                       echo "\t<tr>\n\t\t<th class=\"data\">{$lang['strrolename']}</th>\n";
                        echo "\t\t<th class=\"data\">{$lang['strsuper']}</th>\n";
                        echo "\t\t<th class=\"data\">{$lang['strcreatedb']}</th>\n";
                        echo "\t\t<th class=\"data\">{$lang['strcancreaterole']}</th>\n";
                        echo "\t\t<th class=\"data\">{$lang['strexpires']}</th>\n";
                        echo "\t\t<th class=\"data\">{$lang['strsessiondefaults']}</th>\n";
                        echo "\t</tr>\n";
-                       echo "\t<tr>\n\t\t<td class=\"data1\">", $misc->printVal($roledata->fields['rolname']), "</td>\n";
-                       echo "\t\t<td class=\"data1\" id=\"center\">", (($roledata->fields['rolsuper']) ? $lang['stryes'] : $lang['strno']), "</td>\n";
-                       echo "\t\t<td class=\"data1\" id=\"center\">", (($roledata->fields['rolcreatedb']) ? $lang['stryes'] : $lang['strno']), "</td>\n";
-                       echo "\t\t<td class=\"data1\" id=\"center\">", (($roledata->fields['rolcreaterole']) ? $lang['stryes'] : $lang['strno']), "</td>\n";
-                       echo "\t\t<td class=\"data1\" id=\"center\">", (($roledata->fields['rolinherit']) ? $lang['stryes'] : $lang['strno']), "</td>\n";
-                       echo "\t\t<td class=\"data1\" id=\"center\">", ($roledata->fields['rolconnlimit'] == '-1' ? $lang['strnolimit'] : $misc->printVal($roledata->fields['rolconnlimit'])), "</td>\n";
-                       echo "\t\t<td class=\"data1\">", ($roledata->fields['rolvaliduntil'] == 'infinity' || is_null($roledata->fields['rolvaliduntil']) ? $lang['strnever'] : $misc->printVal($roledata->fields['rolvaliduntil'])), "</td>\n";
-                       echo "\t\t<td class=\"data1\">", $misc->printVal($roledata->fields['rolconfig']), "</td>\n";
+                       echo "\t<tr>\n\t\t<td class=\"data1\">", $misc->printVal($roledata->f['rolname']), "</td>\n";
+                       echo "\t\t<td class=\"data1\" id=\"center\">", (($roledata->f['rolsuper']) ? $lang['stryes'] : $lang['strno']), "</td>\n";
+                       echo "\t\t<td class=\"data1\" id=\"center\">", (($roledata->f['rolcreatedb']) ? $lang['stryes'] : $lang['strno']), "</td>\n";
+                       echo "\t\t<td class=\"data1\" id=\"center\">", (($roledata->f['rolcreaterole']) ? $lang['stryes'] : $lang['strno']), "</td>\n";
+                       echo "\t\t<td class=\"data1\" id=\"center\">", (($roledata->f['rolinherit']) ? $lang['stryes'] : $lang['strno']), "</td>\n";
+                       echo "\t\t<td class=\"data1\" id=\"center\">", ($roledata->f['rolconnlimit'] == '-1' ? $lang['strnolimit'] : $misc->printVal($roledata->f['rolconnlimit'])), "</td>\n";
+                       echo "\t\t<td class=\"data1\">", ($roledata->f['rolvaliduntil'] == 'infinity' ? $lang['strnever'] : $misc->printVal($roledata->f['rolvaliduntil'])), "</td>\n";
+                       echo "\t\t<td class=\"data1\">", $misc->printVal($roledata->f['rolconfig']), "</td>\n";
                        echo "\t</tr>\n</table>\n";
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
                global $PHP_SELF, $lang;
                
                function renderRoleConnLimit($val) {
-                       global $lang;
-                       return $val == '-1' ? $lang['strnolimit'] : htmlspecialchars($val);
+                       return $val == '-1' ? 'No limit' : htmlspecialchars($val);
                }
                
                function renderRoleExpires($val) {
-                       global $lang;
-                       return $val == 'infinity' ? $lang['strnever'] : htmlspecialchars($val);
+                       return $val == 'infinity' ? 'Never' : htmlspecialchars($val);
                }
                
                $misc->printTrail('server');
                $roles = $data->getRoles();
                
                $columns = array(
-                       'role' => array(
-                               'title' => $lang['strrole'],
+                       'rolename' => array(
+                               'title' => $lang['strrolename'],
                                'field' => 'rolname',
                        ),
                        'superuser' => array(
                                'field' => 'rolcanlogin',
                                'type'  => 'yesno',
                        ),
-                       'connlimit' => array(
-                               'title' => $lang['strconnlimit'],
-                               'field' => 'rolconnlimit',
-                               'type'  => 'callback',
-                               'params'=> array('function' => 'renderRoleConnLimit')
-                       ),
                        'expires' => array(
                                'title' => $lang['strexpires'],
                                'field' => 'rolvaliduntil',
                                'type'  => 'callback',
-                               'params'=> array('function' => 'renderRoleExpires', 'null' => $lang['strnever']),
+                               'params'=> array('function' => 'renderRoleExpires'),
                        ),
                        'actions' => array(
                                'title' => $lang['stractions'],
index 7d6abb3fb6bba6148082fee7493821495b87d4d7..bd7b0a21c5d6d51d8a284e5cafea0da21be8c380 100644 (file)
--- a/rules.php
+++ b/rules.php
@@ -3,14 +3,13 @@
        /**
         * List rules on a table OR view
         *
-        * $Id: rules.php,v 1.27 2006/06/17 23:50:19 xzilla Exp $
+        * $Id: rules.php,v 1.27.2.1 2007/05/28 17:21:56 ioguix Exp $
         */
 
        // Include application functions
        include_once('./libraries/lib.inc.php');
 
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
 
        /**
         * Confirm and then actually create a rule
index b2cdc16ffe68411c223add835357f1f844b4522b..1b8e5a6e3c4c144034401513d2c7b3d5236a8e3c 100755 (executable)
@@ -3,7 +3,7 @@
        /**
         * Manage schemas in a database
         *
-        * $Id: schemas.php,v 1.10 2007/01/10 01:15:27 soranzo Exp $
+        * $Id: schemas.php,v 1.8.2.1 2007/05/28 17:21:56 ioguix Exp $
         */
 
        // Include application functions
@@ -11,7 +11,6 @@
        
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
 
        /**
         * Show default list of schemas in the database
                echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strowner']}</th>\n";
                echo "\t\t<td class=\"data1\">\n\t\t\t<select name=\"formAuth\">\n";
                while (!$users->EOF) {
-                       $uname = htmlspecialchars($users->fields['usename']);
+                       $uname = htmlspecialchars($users->f['usename']);
                        echo "\t\t\t\t<option value=\"{$uname}\"",
                                ($uname == $_POST['formAuth']) ? ' selected="selected"' : '', ">{$uname}</option>\n";
                        $users->moveNext();
                }
                echo "\t\t\t</select>\n\t\t</td>\n\t\n";                
                echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strcomment']}</th>\n";
-               echo "\t\t<td class=\"data1\"><textarea name=\"formComment\" rows=\"3\" cols=\"32\">", 
+               echo "\t\t<td class=\"data1\"><textarea name=\"formComment\" rows=\"3\" cols=\"32\" wrap=\"virtual\">", 
                        htmlspecialchars($_POST['formComment']), "</textarea></td>\n\t</tr>\n";
                        
                echo "\t</tr>\n";
 
                $schema = $data->getSchemaByName($_REQUEST['schema']);
                if ($schema->recordCount() > 0) {
-                       if (!isset($_POST['comment'])) $_POST['comment'] = $schema->fields['nspcomment'];
+                       if (!isset($_POST['comment'])) $_POST['comment'] = $schema->f['nspcomment'];
                        if (!isset($_POST['schema'])) $_POST['schema'] = $_REQUEST['schema'];
                        if (!isset($_POST['name'])) $_POST['name'] = $_REQUEST['schema'];
 
                        echo "\t</tr>\n";
                        echo "\t<tr>\n";
                        echo "\t\t<th class=\"data\">{$lang['strcomment']}</th>\n";
-                       echo "\t\t<td class=\"data1\"><textarea cols=\"32\" rows=\"3\"name=\"comment\">", htmlspecialchars($_POST['comment']), "</textarea></td>\n";
+                       echo "\t\t<td class=\"data1\"><textarea cols=\"32\" rows=\"3\"name=\"comment\" wrap=\"virtual\">", htmlspecialchars($_POST['comment']), "</textarea></td>\n";
                        echo "\t</tr>\n";
                        echo "</table>\n";
                        echo "<p><input type=\"hidden\" name=\"action\" value=\"alter\" />\n";
index 4cebda20d7fb137b6b73a79a01cdf9d675c1c09c..fabbd3b22a538ba2b5ed742982b9b4340d7ad72e 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage sequences in a database
         *
-        * $Id: sequences.php,v 1.37 2006/12/31 15:22:59 soranzo Exp $
+        * $Id: sequences.php,v 1.36.2.1 2007/05/28 17:21:56 ioguix Exp $
         */
        
        // Include application functions
@@ -11,7 +11,6 @@
        
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
 
        /**
         * Display list of all sequences in the database/schema
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                        echo "<table>\n";
                        
-                       echo "<tr><th class=\"data left\">{$lang['strstartvalue']}</th>\n";
-                       echo "<td class=\"data1\"><input name=\"formStartValue\" size=\"5\" value=\"",
-                               htmlspecialchars($sequence->f['last_value']), "\" /></td></tr>\n";
-
                        echo "<tr><th class=\"data left\">{$lang['strincrementby']}</th>\n";
                        echo "<td class=\"data1\"><input name=\"formIncrement\" size=\"5\" value=\"",
                                htmlspecialchars($sequence->f['increment_by']), "\" /> </td></tr>\n";
                        
+                       echo "<tr><th class=\"data left\">{$lang['strminvalue']}</th>\n";
+                       echo "<td class=\"data1\"><input name=\"formMinValue\" size=\"5\" value=\"",
+                               htmlspecialchars($sequence->f['min_value']), "\" /></td></tr>\n";
+                       
                        echo "<tr><th class=\"data left\">{$lang['strmaxvalue']}</th>\n";
                        echo "<td class=\"data1\"><input name=\"formMaxValue\" size=\"5\" value=\"",
                                htmlspecialchars($sequence->f['max_value']), "\" /></td></tr>\n";
                        
-                       echo "<tr><th class=\"data left\">{$lang['strminvalue']}</th>\n";
-                       echo "<td class=\"data1\"><input name=\"formMinValue\" size=\"5\" value=\"",
-                               htmlspecialchars($sequence->f['min_value']), "\" /></td></tr>\n";
+                       echo "<tr><th class=\"data left\">{$lang['strstartvalue']}</th>\n";
+                       echo "<td class=\"data1\"><input name=\"formStartValue\" size=\"5\" value=\"",
+                               htmlspecialchars($sequence->f['last_value']), "\" /></td></tr>\n";
                        
                        echo "<tr><th class=\"data left\">{$lang['strcachevalue']}</th>\n";
                        echo "<td class=\"data1\"><input name=\"formCacheValue\" size=\"5\" value=\"",
index 833d2d9e40748dd6a8e0061acc26dca4789deeae..10d96ddf580207a99f6c8b9cc63396e560a055da 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage servers
         *
-        * $Id: servers.php,v 1.6 2007/01/10 01:25:12 soranzo Exp $
+        * $Id: servers.php,v 1.5.2.1 2007/05/28 17:21:56 ioguix Exp $
         */
 
        // Include application functions
@@ -12,7 +12,6 @@
        
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
        
        function doLogout() {
                global $misc, $lang, $_reload_browser;
@@ -34,7 +33,7 @@
                $servers = $misc->getServers(true);
                
                function svPre(&$rowdata, $actions) {
-                       $actions['logout']['disable'] = empty($rowdata->fields['username']);
+                       $actions['logout']['disable'] = empty($rowdata->f['username']);
                        return $actions;
                }
                
diff --git a/sql.php b/sql.php
index 03bd8c3c6f428c02ab6c509114256ad1aca48cd3..3ab7d5b659900551e382af9ca70df2f9341609cb 100644 (file)
--- a/sql.php
+++ b/sql.php
@@ -6,7 +6,7 @@
         * how many SQL statements have been strung together with semi-colons
         * @param $query The SQL query string to execute
         *
-        * $Id: sql.php,v 1.33 2007/01/10 01:31:18 soranzo Exp $
+        * $Id: sql.php,v 1.32.4.1 2007/05/28 17:21:56 ioguix Exp $
         */
 
        // Prevent timeouts on large exports (non-safe mode only)
@@ -87,8 +87,6 @@
                exit;
        }
        
-       $PHP_SELF = $_SERVER['PHP_SELF'];
-
        $misc->printHeader($lang['strqueryresults']);
        $misc->printBody();
        $misc->printTrail('database');
                        // First, if rows returned, then display the results
                        if ($rs->recordCount() > 0) {
                                echo "<table>\n<tr>";
-                               foreach ($rs->fields as $k => $v) {
+                               foreach ($rs->f as $k => $v) {
                                        $finfo = $rs->fetchField($k);
                                        echo "<th class=\"data\">", $misc->printVal($finfo->name), "</th>";
                                }
                                while (!$rs->EOF) {
                                        $id = (($i % 2) == 0 ? '1' : '2');
                                        echo "<tr>\n";
-                                       foreach ($rs->fields as $k => $v) {
+                                       foreach ($rs->f as $k => $v) {
                                                $finfo = $rs->fetchField($k);
                                                echo "<td class=\"data{$id}\" nowrap=\"nowrap\">", $misc->printVal($v, $finfo->type, array('null' => true)), "</td>";
                                        }                                                       
index b583c44f5cd800df5e441c80c95095ca188688ff..c6a1373c630e189f90f74c2c3b539990fe44956d 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Alternative SQL editing window
         *
-        * $Id: sqledit.php,v 1.31 2007/01/10 01:31:18 soranzo Exp $
+        * $Id: sqledit.php,v 1.30.2.1 2007/05/28 17:21:56 ioguix Exp $
         */
 
        // Include application functions
@@ -11,7 +11,6 @@
 
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
 
        /**
         * Private function to display server and list of databases
@@ -62,7 +61,7 @@
                        echo ": <select name=\"database\" {$onchange}>\n";
                        
                        while (!$databases->EOF) {
-                               $dbname = $databases->fields['datname'];
+                               $dbname = $databases->f['datname'];
                                echo "<option value=\"", htmlspecialchars($dbname), "\"",
                                ((isset($_REQUEST['database']) && $dbname == $_REQUEST['database'])) ? ' selected="selected"' : '', ">",
                                        htmlspecialchars($dbname), "</option>\n";
index 5f6e557973cc9792edd699c0c71a40eb5d788456..9f75b69306b522a7ac64e70162f7feca29fcd7a3 100644 (file)
@@ -3,14 +3,13 @@
        /**
         * List tables in a database
         *
-        * $Id: tables.php,v 1.85 2007/01/03 15:35:42 soranzo Exp $
+        * $Id: tables.php,v 1.82.2.1 2007/05/28 17:21:56 ioguix Exp $
         */
 
        // Include application functions
        include_once('./libraries/lib.inc.php');
 
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
 
        /**
         * Displays a screen where they can enter a new table
@@ -70,7 +69,7 @@
                                }
 
                                echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strcomment']}</th>\n";
-                               echo "\t\t<td><textarea name=\"tblcomment\" rows=\"3\" cols=\"32\">", 
+                               echo "\t\t<td><textarea name=\"tblcomment\" rows=\"3\" cols=\"32\" wrap=\"virtual\">", 
                                        htmlspecialchars($_REQUEST['tblcomment']), "</textarea></td>\n\t</tr>\n";
 
                                echo "</table>\n";
                global $lang;
                global $PHP_SELF;
 
-               $bAllowAC = ($conf['autocomplete'] != 'disable') ? TRUE : FALSE;
+               $bAllowAC = ($conf["autocomplete"]!='disable') ? TRUE : FALSE ;
 
                if ($confirm) {
                        $misc->printTrail('table');
                                $arrayLocals = array();
                                $arrayRefs = array();
                                $nC = 0;
+                               // A word of caution, the following does not support multicolumn FK's at the moment
                                while(!$constraints->EOF) {
-                                       // The following RE will match a FK constrain with a single (quoted or not) referencing column. At the moment we don't support multicolumn FKs
-                                       preg_match('/^FOREIGN KEY \(("[^"]*"|[^\s",]*)\) REFERENCES (.*)\((.*)\)/i', $constraints->fields['consrc'], $matches);
+                                       preg_match('/foreign key \((\w+)\) references ([\w]+)\((\w+)\)/i',$constraints->fields["consrc"],$matches);
                                        if(!empty($matches)) {
-                                               // Strip possible quotes and save
-                                               $arrayLocals[$nC] = preg_replace('/"(.*)"/', '$1', $matches[1]);
-                                               $arrayRefs[$nC] = array(preg_replace('/"(.*)"/', '$1', $matches[2]), preg_replace('/"(.*)"/', '$1', $matches[3]));
+                                               $arrayLocals[$nC] = $matches[1];
+                                               $arrayRefs[$nC] = array($matches[2],$matches[3]);
                                                $nC++;
                                        }
                                        $constraints->moveNext();
                                $i = 0;
                                while (!$attrs->EOF) {
                                        $szValueName = "values[{$attrs->f['attname']}]";
-                                       $szEvents = '';
-                                       $szDivPH = '';
+                                       $szEvents = "";
+                                       $szDivPH = "";
                                        if($bAllowAC) {
-                                               $idxFound = array_search($attrs->f['attname'], $arrayLocals);
-                                               // In PHP < 4.2.0 array_search returns NULL on failure
-                                               if ($idxFound !== NULL && $idxFound !== FALSE) { 
-                                                       $szEvent = "makeAC('{$szValueName}',{$i},'{$arrayRefs[$idxFound][0]}','{$arrayRefs[$idxFound][1]}','{$_REQUEST['server']}','{$_REQUEST['database']}');";
+                                               if(($idxFound = array_search($attrs->f['attname'],$arrayLocals))!==false) {
+                                                       $szEvent = "makeAC('{$szValueName}',{$i},'{$arrayRefs[$idxFound][0]}','{$arrayRefs[$idxFound][1]}','{$_REQUEST["server"]}','{$_REQUEST["database"]}');";
                                                        $szEvents = "onfocus=\"{$szEvent}\" onblur=\"hideAC();document.getElementById('ac_form').onsubmit=function(){return true;};\" onchange=\"{$szEvent}\" id=\"{$szValueName}\" onkeyup=\"{$szEvent}\" autocomplete=\"off\" class='ac_field'";
                                                        $szDivPH = "<div id=\"fac{$i}_ph\"></div>";
                                                }
                        echo "<input type=\"submit\" name=\"insertandrepeat\" value=\"{$lang['strinsertandrepeat']}\" />\n";
                        echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
                        if($bAllowAC) {
-                               $szChecked = $conf['autocomplete'] != 'default off' ? 'checked="checked"' : '';
+                               $szChecked = $conf["autocomplete"]!='default off' ? "checked=\"checked\"" : "";
                                echo "<input type=\"checkbox\" name=\"no_ac\" id=\"no_ac\" onclick=\"rEB(this.checked);\" value=\"1\" {$szChecked} /><label for='no_ac' onmouseover='this.style.cursor=\"pointer\";'>{$lang['strac']}</label>\n";
                        }
                        echo "</p>\n";
index cdade0395b0c9ce72a3ae343f5f8dc8e736364a8..95292dd11c2d3b76e2bc318271d0b7db6172336b 100755 (executable)
@@ -3,7 +3,7 @@
        /**
         * Manage tablespaces in a database cluster
         *
-        * $Id: tablespaces.php,v 1.12 2007/01/15 15:48:17 soranzo Exp $
+        * $Id: tablespaces.php,v 1.10.2.1 2007/05/28 17:21:56 ioguix Exp $
         */
 
        // Include application functions
@@ -11,7 +11,6 @@
 
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
 
        /**
         * Function to allow altering of a tablespace
                
                if ($tablespace->recordCount() > 0) {
                        
-                       if (!isset($_POST['name'])) $_POST['name'] = $tablespace->fields['spcname'];
-                       if (!isset($_POST['owner'])) $_POST['owner'] = $tablespace->fields['spcowner'];
+                       if (!isset($_POST['name'])) $_POST['name'] = $tablespace->f['spcname'];
+                       if (!isset($_POST['owner'])) $_POST['owner'] = $tablespace->f['spcowner'];
                        if (!isset($_POST['comment'])) {
-                               $_POST['comment'] = ($data->hasSharedComments()) ? $tablespace->fields['spccomment'] : '';
+                               $_POST['comment'] = ($data->hasSharedComments()) ? $tablespace->f['spccomment'] : '';
                        }
                        
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
@@ -47,7 +46,7 @@
                        echo "<tr><th class=\"data left required\">{$lang['strowner']}</th>\n";
                        echo "<td class=\"data1\"><select name=\"owner\">";
                        while (!$users->EOF) {
-                               $uname = $users->fields['usename'];
+                               $uname = $users->f['usename'];
                                echo "<option value=\"", htmlspecialchars($uname), "\"",
                                        ($uname == $_POST['owner']) ? ' selected="selected"' : '', ">", htmlspecialchars($uname), "</option>\n";
                                $users->moveNext();
@@ -56,7 +55,7 @@
                        if ($data->hasSharedComments()){
                                echo "<tr><th class=\"data left\">{$lang['strcomment']}</th>\n";
                                echo "<td class=\"data1\">";
-                               echo "<textarea rows=\"3\" cols=\"32\" name=\"comment\">",
+                               echo "<textarea rows=\"3\" cols=\"32\" name=\"comment\" wrap=\"virtual\">",
                                        htmlspecialchars($_POST['comment']), "</textarea></td></tr>\n";
                        }
                        echo "</table>\n";
                echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strowner']}</th>\n";
                echo "\t\t<td class=\"data1\"><select name=\"formOwner\">\n";
                while (!$users->EOF) {
-                       $uname = $users->fields['usename'];
+                       $uname = $users->f['usename'];
                        echo "\t\t\t<option value=\"", htmlspecialchars($uname), "\"",
                                ($uname == $_POST['formOwner']) ? ' selected="selected"' : '', ">", htmlspecialchars($uname), "</option>\n";
                        $users->moveNext();
                // Comments (if available)
                if ($data->hasSharedComments()) {
                        echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strcomment']}</th>\n";
-                       echo "\t\t<td><textarea name=\"formComment\" rows=\"3\" cols=\"32\">", 
+                       echo "\t\t<td><textarea name=\"formComment\" rows=\"3\" cols=\"32\" wrap=\"virtual\">", 
                                htmlspecialchars($_POST['formComment']), "</textarea></td>\n\t</tr>\n";
                }
                echo "</table>\n";
index 59b44390367fb80ecd34e0e780bdbfa8dfc3750d..fa5f0778de7a36fbb9fb5b629fc33b84d9cc6a09 100644 (file)
@@ -3,14 +3,13 @@
        /**
         * List tables in a database
         *
-        * $Id: tblproperties.php,v 1.73 2007/01/02 17:24:44 soranzo Exp $
+        * $Id: tblproperties.php,v 1.72.2.1 2007/05/28 17:21:56 ioguix Exp $
         */
 
        // Include application functions
        include_once('./libraries/lib.inc.php');
 
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
 
        /** 
         * Function to save after altering a table
                        
                        echo "<tr><th class=\"data left\">{$lang['strcomment']}</th>\n";
                        echo "<td class=\"data1\">";
-                       echo "<textarea rows=\"3\" cols=\"32\" name=\"comment\">",
+                       echo "<textarea rows=\"3\" cols=\"32\" name=\"comment\" wrap=\"virtual\">",
                                htmlspecialchars($_POST['comment']), "</textarea></td></tr>\n";
                        echo "</table>\n";
                        echo "<p><input type=\"hidden\" name=\"action\" value=\"alter\" />\n";
index 47f3686bae086a8a33e00ba8ab7e47f55d2e5edd..7541c92ca28da3050ac805af927dbfae242d4af3 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * List triggers on a table
         *
-        * $Id: triggers.php,v 1.31 2007/01/15 15:48:17 soranzo Exp $
+        * $Id: triggers.php,v 1.30.2.1 2007/05/28 17:21:56 ioguix Exp $
         */
 
        // Include application functions
@@ -11,7 +11,6 @@
        include_once('./classes/class.select.php');
        
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
 
        /** 
         * Function to save after altering a trigger
@@ -41,7 +40,7 @@
                
                if ($triggerdata->recordCount() > 0) {
                        
-                       if (!isset($_POST['name'])) $_POST['name'] = $triggerdata->fields['tgname'];
+                       if (!isset($_POST['name'])) $_POST['name'] = $triggerdata->f['tgname'];
                        
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                        echo "<table>\n";
                /* Populate functions */
                $sel0 = new XHTML_Select('formFunction');
                while (!$funcs->EOF) {
-                       $sel0->add(new XHTML_Option($funcs->fields['proname']));
+                       $sel0->add(new XHTML_Option($funcs->f['proname']));
                        $funcs->moveNext();
                }
 
                function tgPre(&$rowdata) {
                        global $data, $lang;
                        // Nasty hack to support pre-7.4 PostgreSQL
-                       $rowdata->fields['+tgdef'] = $rowdata->fields['tgdef'] !== null
-                                                                       ? $rowdata->fields['tgdef']
-                                                                       : $data->getTriggerDef($rowdata->fields);
+                       $rowdata->f['+tgdef'] = $rowdata->f['tgdef'] !== null
+                                                                       ? $rowdata->f['tgdef']
+                                                                       : $data->getTriggerDef($rowdata->f);
                }
                
                $misc->printTrail('table');
index c25c58672f7a046267bf03e19af9fc27af612304..9f92a77ad9260a4e559cac85901f30b30d9b4b09 100644 (file)
--- a/types.php
+++ b/types.php
@@ -3,7 +3,7 @@
        /**
         * Manage types in a database
         *
-        * $Id: types.php,v 1.32 2007/01/02 17:24:44 soranzo Exp $
+        * $Id: types.php,v 1.31.2.1 2007/05/28 17:21:56 ioguix Exp $
         */
 
        // Include application functions
@@ -11,7 +11,6 @@
        
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
 
        /**
         * Show read only properties for a type
                                        htmlspecialchars($_REQUEST['fields']), "\" /></td>\n\t</tr>\n";
 
                                echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strcomment']}</th>\n";
-                               echo "\t\t<td><textarea name=\"typcomment\" rows=\"3\" cols=\"32\">", 
+                               echo "\t\t<td><textarea name=\"typcomment\" rows=\"3\" cols=\"32\" wrap=\"virtual\">", 
                                        htmlspecialchars($_REQUEST['typcomment']), "</textarea></td>\n\t</tr>\n";
 
                                echo "</table>\n";
index e367d9e89bb40ccd8f7609491e9bea3c55619716..3679b4679a78ba90792a2e129f32940cbdfe7635 100644 (file)
--- a/users.php
+++ b/users.php
@@ -3,7 +3,7 @@
        /**
         * Manage users in a database cluster
         *
-        * $Id: users.php,v 1.34 2007/01/10 01:38:48 soranzo Exp $
+        * $Id: users.php,v 1.32.2.1 2007/05/28 17:21:57 ioguix Exp $
         */
 
        // Include application functions
@@ -11,7 +11,6 @@
 
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
                
        /**
         * If a user is not a superuser, then we have an 'account management' page
                $misc->printMsg($msg);
 
                if ($userdata->recordCount() > 0) {
-                       $userdata->fields['usesuper'] = $data->phpBool($userdata->fields['usesuper']);
-                       $userdata->fields['usecreatedb'] = $data->phpBool($userdata->fields['usecreatedb']);
+                       $userdata->f['usesuper'] = $data->phpBool($userdata->f['usesuper']);
+                       $userdata->f['usecreatedb'] = $data->phpBool($userdata->f['usecreatedb']);
                        echo "<table>\n";
                        echo "<tr><th class=\"data\">{$lang['strusername']}</th><th class=\"data\">{$lang['strsuper']}</th><th class=\"data\">{$lang['strcreatedb']}</th><th class=\"data\">{$lang['strexpires']}</th>";
                        if ($data->hasUserSessionDefaults()) echo "<th class=\"data\">{$lang['strsessiondefaults']}</th>";
                        echo "</tr>\n";
-                       echo "<tr>\n\t<td class=\"data1\">", $misc->printVal($userdata->fields['usename']), "</td>\n";
-                       echo "\t<td class=\"data1\">", (($userdata->fields['usesuper']) ? $lang['stryes'] : $lang['strno']), "</td>\n";
-                       echo "\t<td class=\"data1\">", (($userdata->fields['usecreatedb']) ? $lang['stryes'] : $lang['strno']), "</td>\n";
-                       echo "\t<td class=\"data1\">", ($userdata->fields['useexpires'] == 'infinity' || is_null($userdata->fields['useexpires']) ? $lang['strnever'] : $misc->printVal($userdata->fields['useexpires'])), "</td>\n";
-                       if ($data->hasUserSessionDefaults()) echo "\t<td class=\"data1\">", $misc->printVal($userdata->fields['useconfig']), "</td>\n";
+                       echo "<tr>\n\t<td class=\"data1\">", $misc->printVal($userdata->f['usename']), "</td>\n";
+                       echo "\t<td class=\"data1\">", (($userdata->f['usesuper']) ? $lang['stryes'] : $lang['strno']), "</td>\n";
+                       echo "\t<td class=\"data1\">", (($userdata->f['usecreatedb']) ? $lang['stryes'] : $lang['strno']), "</td>\n";
+                       echo "\t<td class=\"data1\">", ($userdata->f['useexpires'] == 'infinity' ? '' : $misc->printVal($userdata->f['useexpires'])), "</td>\n";
+                       if ($data->hasUserSessionDefaults()) echo "\t<td class=\"data1\">", $misc->printVal($userdata->f['useconfig']), "</td>\n";
                        echo "</tr>\n</table>\n";
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
                if ($userdata->recordCount() > 0) {
                        $server_info = $misc->getServerInfo();
                        $canRename = $data->hasUserRename() && ($_REQUEST['username'] != $server_info['username']);
-                       $userdata->fields['usesuper'] = $data->phpBool($userdata->fields['usesuper']);
-                       $userdata->fields['usecreatedb'] = $data->phpBool($userdata->fields['usecreatedb']);
+                       $userdata->f['usesuper'] = $data->phpBool($userdata->f['usesuper']);
+                       $userdata->f['usecreatedb'] = $data->phpBool($userdata->f['usecreatedb']);
 
                        if (!isset($_POST['formExpires'])){
-                               if ($canRename) $_POST['newname'] = $userdata->fields['usename'];
-                               if ($userdata->fields['usesuper']) $_POST['formSuper'] = '';
-                               if ($userdata->fields['usecreatedb']) $_POST['formCreateDB'] = '';
-                               $_POST['formExpires'] = $userdata->fields['useexpires'] == 'infinity' ? '' : $userdata->fields['useexpires'];
+                               if ($canRename) $_POST['newname'] = $userdata->f['usename'];
+                               if ($userdata->f['usesuper']) $_POST['formSuper'] = '';
+                               if ($userdata->f['usecreatedb']) $_POST['formCreateDB'] = '';
+                               $_POST['formExpires'] = $userdata->f['useexpires'] == 'infinity' ? '' : $userdata->f['useexpires'];
                                $_POST['formPassword'] = '';
                        }
                
                        echo $misc->form;
                        echo "<table>\n";
                        echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strusername']}</th>\n";
-                       echo "\t\t<td class=\"data1\">", ($canRename ? "<input name=\"newname\" size=\"15\" value=\"" . htmlspecialchars($_POST['newname']) . "\" />" : $misc->printVal($userdata->fields['usename'])), "</td>\n\t</tr>\n";
+                       echo "\t\t<td class=\"data1\">", ($canRename ? "<input name=\"newname\" size=\"15\" value=\"" . htmlspecialchars($_POST['newname']) . "\" />" : $misc->printVal($userdata->f['usename'])), "</td>\n\t</tr>\n";
                        echo "\t<tr>\n\t\t<th class=\"data left\"><label for=\"formSuper\">{$lang['strsuper']}</label></th>\n";
                        echo "\t\t<td class=\"data1\"><input type=\"checkbox\" id=\"formSuper\" name=\"formSuper\"", 
                                (isset($_POST['formSuper'])) ? ' checked="checked"' : '', " /></td>\n\t</tr>\n";
                global $PHP_SELF, $lang;
                
                function renderUseExpires($val) {
-                       global $lang;
-                       return $val == 'infinity' ? $lang['strnever'] : htmlspecialchars($val);
+                       return $val == 'infinity' ? '' : htmlspecialchars($val);
                }
                
                $misc->printTrail('server');
                                'title' => $lang['strexpires'],
                                'field' => 'useexpires',
                                'type'  => 'callback',
-                               'params'=> array('function' => 'renderUseExpires', 'null' => $lang['strnever']),
+                               'params'=> array('function' => 'renderUseExpires'),
                        ),
                        'defaults' => array(
                                'title' => $lang['strsessiondefaults'],
index 3109de91daec1773ea390e66c1fdfb9d42da557c..5136c2f24b1781e3452304c8ab943ec29aafd073 100755 (executable)
@@ -3,14 +3,13 @@
        /**
         * List views in a database
         *
-        * $Id: viewproperties.php,v 1.22 2007/01/02 17:24:44 soranzo Exp $
+        * $Id: viewproperties.php,v 1.21.2.1 2007/05/28 17:21:57 ioguix Exp $
         */
 
        // Include application functions
        include_once('./libraries/lib.inc.php');
 
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
 
        /** 
         * Function to save after editing a view
                        echo "<form action=\"$PHP_SELF\" 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\">", 
+                       echo "\t\t<td class=\"data1\"><textarea style=\"width: 100%;\" rows=\"20\" cols=\"50\" name=\"formDefinition\" wrap=\"virtual\">", 
                                htmlspecialchars($_POST['formDefinition']), "</textarea></td>\n\t</tr>\n";
                        echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strcomment']}</th>\n";
-                       echo "\t\t<td class=\"data1\"><textarea rows=\"3\" cols=\"32\" name=\"formComment\">", 
+                       echo "\t\t<td class=\"data1\"><textarea rows=\"3\" cols=\"32\" name=\"formComment\" wrap=\"virtual\">", 
                                htmlspecialchars($_POST['formComment']), "</textarea></td>\n\t</tr>\n";
                        echo "</table>\n";
                        echo "<p><input type=\"hidden\" name=\"action\" value=\"save_edit\" />\n";
index be2226ddcc6bfc22d32a2f4b5894896a50920b37..a6724c00ad86bf7c830921769c72b7814308ae22 100644 (file)
--- a/views.php
+++ b/views.php
@@ -3,7 +3,7 @@
        /**
         * Manage views in a database
         *
-        * $Id: views.php,v 1.61 2007/01/02 17:24:44 soranzo Exp $
+        * $Id: views.php,v 1.60.2.1 2007/05/28 17:21:57 ioguix Exp $
         */
 
        // Include application functions
@@ -12,7 +12,6 @@
        
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';
-       $PHP_SELF = $_SERVER['PHP_SELF'];
 
        /**
         * Ask for select parameters and perform select
                        echo "<tr><th class=\"data\">{$lang['strcomment']}</th></tr>";
                        echo "<tr>\n<td class=\"data1\">\n";
                        // View comments
-                       echo "<textarea name=\"formComment\" rows=\"3\" cols=\"32\">", 
+                       echo "<textarea name=\"formComment\" rows=\"3\" cols=\"32\" wrap=\"virtual\">", 
                                htmlspecialchars($_REQUEST['formComment']), "</textarea>\n";
                        echo "</td>\n</tr>\n";
                        echo "</table>\n";
                echo "\t<td class=\"data1\"><input name=\"formView\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"", 
                        htmlspecialchars($_REQUEST['formView']), "\" /></td>\n\t</tr>\n";
                echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strdefinition']}</th>\n";
-               echo "\t<td class=\"data1\"><textarea style=\"width:100%;\" rows=\"10\" cols=\"50\" name=\"formDefinition\">", 
+               echo "\t<td class=\"data1\"><textarea style=\"width:100%;\" rows=\"10\" cols=\"50\" name=\"formDefinition\" wrap=\"virtual\">", 
                        htmlspecialchars($_REQUEST['formDefinition']), "</textarea></td>\n\t</tr>\n";
                echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strcomment']}</th>\n";
-               echo "\t\t<td class=\"data1\"><textarea name=\"formComment\" rows=\"3\" cols=\"32\">", 
+               echo "\t\t<td class=\"data1\"><textarea name=\"formComment\" rows=\"3\" cols=\"32\" wrap=\"virtual\">", 
                        htmlspecialchars($_REQUEST['formComment']), "</textarea></td>\n\t</tr>\n";
                echo "</table>\n";
                echo "<p><input type=\"hidden\" name=\"action\" value=\"save_create\" />\n";