Try to fix all use of bad references for PHP 4.4.0. Still requires testing.

diff --git a/DEVELOPERS b/DEVELOPERS
index 5e463a991f393202d776b4bd9156e3afe0fc0c15..d8d94372efb7d2a3132e799927c9a5d2d0460145 100644 (file)
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -87,7 +87,7 @@ oriented (ADODB_base.pclass).
 
 This is the general form for looping over a recordset:
 
-$rs = &$class->getResults();
+$rs = $class->getResults();
 if (is_object($rs) && $rs->recordCount() > 0) {
        while (!$rs->EOF) {
                echo $rs->f['field'];

diff --git a/aggregates.php b/aggregates.php
index e7ab25a15ef8186b0798674d64c4ace4cfacda71..30a050875f1eb4e8e248952ba9d898d70fa1aca4 100644 (file)
--- a/aggregates.php
+++ b/aggregates.php
@@ -3,7 +3,7 @@
        /**
         * Manage aggregates in a database
         *
-        * $Id: aggregates.php,v 1.10 2004/09/20 14:41:38 jollytoad Exp $
+        * $Id: aggregates.php,v 1.10.2.1 2005/10/18 03:15:57 chriskl Exp $
         */
 
        // Include application functions
@@ -23,7 +23,7 @@
                $misc->printTabs('schema', 'aggregates');
                $misc->printMsg($msg);
                
-               $aggregates = &$data->getAggregates();
+               $aggregates = $data->getAggregates();
 
                $columns = array(
                        'aggregate' => array(

diff --git a/all_db.php b/all_db.php
index d6161e1501786555e985592b071c1d8755ec5887..c5f560a22752f6d7c82824920b3e617daa4da027 100644 (file)
--- a/all_db.php
+++ b/all_db.php
@@ -3,7 +3,7 @@
        /**
         * Manage databases within a server
         *
-        * $Id: all_db.php,v 1.35 2004/09/07 13:58:21 jollytoad Exp $
+        * $Id: all_db.php,v 1.35.2.1 2005/10/18 03:15:57 chriskl Exp $
         */
 
        // Include application functions
@@ -67,7 +67,7 @@
                if (!isset($_POST['formSpc'])) $_POST['formSpc'] = '';
                
                // Fetch all tablespaces from the database
-               if ($data->hasTablespaces()) $tablespaces = &$data->getTablespaces();
+               if ($data->hasTablespaces()) $tablespaces = $data->getTablespaces();
 
                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                echo "<table>\n";
@@ -192,7 +192,7 @@
                $misc->printTabs('server','databases');
                $misc->printMsg($msg);
                
-               $databases = &$data->getDatabases();
+               $databases = $data->getDatabases();
 
                $columns = array(
                        'database' => array(

diff --git a/casts.php b/casts.php
index 974035885b54aa6de4bb5dae7dffc63cbe09c76e..5ac54030628940faccc502481767a80cf8951330 100644 (file)
--- a/casts.php
+++ b/casts.php
@@ -3,7 +3,7 @@
        /**
         * Manage casts in a database
         *
-        * $Id: casts.php,v 1.9 2004/09/01 16:35:57 jollytoad Exp $
+        * $Id: casts.php,v 1.9.2.1 2005/10/18 03:15:57 chriskl Exp $
         */
 
        // Include application functions
@@ -33,7 +33,7 @@
                $misc->printTabs('database','casts');
                $misc->printMsg($msg);
                
-               $casts = &$data->getcasts();
+               $casts = $data->getcasts();
 
                $columns = array(
                        'source_type' => array(

diff --git a/classes/Reports.php b/classes/Reports.php
index a1778ffced9d02d77ab5f0eea479a71f326648a7..d3bfd231b5d972edcfb390acb67807e158de8350 100644 (file)
--- a/classes/Reports.php
+++ b/classes/Reports.php
@@ -4,7 +4,7 @@
         * the functions provided by the database driver exclusively, and hence
         * will work with any database without modification.
         *
-        * $Id: Reports.php,v 1.11.2.1 2005/07/31 09:18:39 chriskl Exp $
+        * $Id: Reports.php,v 1.11.2.2 2005/10/18 03:15:57 chriskl Exp $
         */
 
        class Reports {
@@ -22,7 +22,7 @@
                        if ($rs->recordCount() != 1) $status = -1;
                        else {
                                // Create a new database access object.
-                               $this->driver = &$misc->getDatabaseAccessor($this->reports_db);
+                               $this->driver = $misc->getDatabaseAccessor($this->reports_db);
                                // Reports database should have been created in public schema
                                if ($this->driver->hasSchemas()) $this->driver->setSchema('public');
                                $status = 0;

diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
index a3be94d39dd4478192a6c352a31eb52537195f69..e5f12af3b44e2c2e80d22c5feff3a26cda33739f 100755 (executable)
--- a/classes/database/Postgres.php
+++ b/classes/database/Postgres.php
@@ -4,7 +4,7 @@
  * A class that implements the DB interface for Postgres
  * Note: This class uses ADODB and returns RecordSets.
  *
- * $Id: Postgres.php,v 1.250.2.6 2005/08/12 01:39:57 chriskl Exp $
+ * $Id: Postgres.php,v 1.250.2.7 2005/10/18 03:15:58 chriskl Exp $
  */
 
 // @@@ THOUGHT: What about inherits? ie. use of ONLY???
@@ -792,7 +792,7 @@ class Postgres extends ADODB_base {
                // Owner
                if ($this->hasAlterTableOwner() && $owner != '') {
                        // Fetch existing owner
-                       $data = &$this->getTable($table);
+                       $data = $this->getTable($table);
                        if ($data->recordCount() != 1) {
                                $this->rollbackTransaction();
                                return -5;
@@ -815,7 +815,7 @@ class Postgres extends ADODB_base {
                // Tablespace
                if ($this->hasTablespaces() && $tablespace != '') {
                        // Fetch existing tablespace
-                       $data = &$this->getTable($table);
+                       $data = $this->getTable($table);
                        if ($data->recordCount() != 1) {
                                $this->rollbackTransaction();
                                return -5;
@@ -900,7 +900,7 @@ class Postgres extends ADODB_base {
         */
        function getTableDefPrefix($table, $clean = false) {
                // Fetch table
-               $t = &$this->getTable($table);
+               $t = $this->getTable($table);
                if (!is_object($t) || $t->recordCount() != 1) {
                        $this->rollbackTransaction();
                        return null;
@@ -908,14 +908,14 @@ class Postgres extends ADODB_base {
                $this->fieldClean($t->f['relname']);
 
                // Fetch attributes
-               $atts = &$this->getTableAttributes($table);
+               $atts = $this->getTableAttributes($table);
                if (!is_object($atts)) {
                        $this->rollbackTransaction();
                        return null;
                }
 
                // Fetch constraints
-               $cons = &$this->getConstraints($table);
+               $cons = $this->getConstraints($table);
                if (!is_object($cons)) {
                        $this->rollbackTransaction();
                        return null;
@@ -990,11 +990,11 @@ class Postgres extends ADODB_base {
                        else {
                                switch ($cons->f['contype']) {
                                        case 'p':
-                                               $keys = &$this->getAttributeNames($table, explode(' ', $cons->f['indkey']));
+                                               $keys = $this->getAttributeNames($table, explode(' ', $cons->f['indkey']));
                                                $sql .= "PRIMARY KEY (" . join(',', $keys) . ")";
                                                break;
                                        case 'u':
-                                               $keys = &$this->getAttributeNames($table, explode(' ', $cons->f['indkey']));
+                                               $keys = $this->getAttributeNames($table, explode(' ', $cons->f['indkey']));
                                                $sql .= "UNIQUE (" . join(',', $keys) . ")";
                                                break;
                                        default:
@@ -1022,7 +1022,7 @@ class Postgres extends ADODB_base {
                 * You also need to make sure you don't dump inherited columns and defaults, as well
                 * as inherited NOT NULL and CHECK constraints.  So for the time being, we just do
                 * not claim to support inheritance.
-               $parents = &$this->getTableParents($table);
+               $parents = $this->getTableParents($table);
                if ($parents->recordCount() > 0) {
                        $sql .= " INHERITS (";
                        while (!$parents->EOF) {
@@ -1101,7 +1101,7 @@ class Postgres extends ADODB_base {
                if ($col_comments_sql != '') $sql .= $col_comments_sql;
 
                // Privileges
-               $privs = &$this->getPrivileges($table, 'table');
+               $privs = $this->getPrivileges($table, 'table');
                if (!is_array($privs)) {
                        $this->rollbackTransaction();
                        return null;
@@ -1210,7 +1210,7 @@ class Postgres extends ADODB_base {
                $sql = '';
 
                // Indexes
-               $indexes = &$this->getIndexes($table);
+               $indexes = $this->getIndexes($table);
                if (!is_object($indexes)) {
                        $this->rollbackTransaction();
                        return null;
@@ -1226,7 +1226,7 @@ class Postgres extends ADODB_base {
                }
 
                // Triggers
-               $triggers = &$this->getTriggers($table);
+               $triggers = $this->getTriggers($table);
                if (!is_object($triggers)) {
                        $this->rollbackTransaction();
                        return null;
@@ -1248,7 +1248,7 @@ class Postgres extends ADODB_base {
                }
 
                // Rules
-               $rules = &$this->getRules($table);
+               $rules = $this->getRules($table);
                if (!is_object($rules)) {
                        $this->rollbackTransaction();
                        return null;
@@ -1804,7 +1804,7 @@ class Postgres extends ADODB_base {
         */
        function resetSequence($sequence) {
                // Get the minimum value of the sequence
-               $seq = &$this->getSequence($sequence);
+               $seq = $this->getSequence($sequence);
                if ($seq->recordCount() != 1) return -1;
                $minvalue = $seq->f[$this->sqFields['minvalue']];
 
@@ -2467,7 +2467,7 @@ class Postgres extends ADODB_base {
         */
        function dropOperator($operator_oid, $cascade) {
                // Function comes in with $object as operator OID
-               $opr = &$this->getOperator($operator_oid);
+               $opr = $this->getOperator($operator_oid);
                $this->fieldClean($opr->f['oprname']);
 
                $sql = "DROP OPERATOR {$opr->f['oprname']} (";
@@ -3172,7 +3172,7 @@ class Postgres extends ADODB_base {
                                break;
                        case 'function':
                                // Function comes in with $object as function OID
-                               $fn = &$this->getFunction($object);
+                               $fn = $this->getFunction($object);
                                $this->fieldClean($fn->f['proname']);
                                $sql .= " FUNCTION \"{$fn->f['proname']}\"({$fn->f['proarguments']})";
                                break;
@@ -3520,7 +3520,7 @@ class Postgres extends ADODB_base {
         */
        function dropFunction($function_oid, $cascade) {
                // Function comes in with $object as function OID
-               $fn = &$this->getFunction($function_oid);
+               $fn = $this->getFunction($function_oid);
                $this->fieldClean($fn->f['proname']);
                
                $sql = "DROP FUNCTION \"{$fn->f['proname']}\"({$fn->f['proarguments']})";

diff --git a/classes/database/Postgres71.php b/classes/database/Postgres71.php
index 9757f995dee00f8a12063a206856657eed33dc83..a83a220a14e6895dd5b13a9fc1f4f9ef0bbee986 100644 (file)
--- a/classes/database/Postgres71.php
+++ b/classes/database/Postgres71.php
@@ -4,7 +4,7 @@
  * A class that implements the DB interface for Postgres
  * Note: This class uses ADODB and returns RecordSets.
  *
- * $Id: Postgres71.php,v 1.68.2.1 2005/07/31 09:18:39 chriskl Exp $
+ * $Id: Postgres71.php,v 1.68.2.2 2005/10/18 03:15:58 chriskl Exp $
  */
 
 // @@@ THOUGHT: What about inherits? ie. use of ONLY???
@@ -186,7 +186,7 @@ class Postgres71 extends Postgres {
         */
        function resetSequence($sequence) {
                // Get the minimum value of the sequence
-               $seq = &$this->getSequence($sequence);
+               $seq = $this->getSequence($sequence);
                if ($seq->recordCount() != 1) return -1;
                $minvalue = $seq->f['min_value'];
 

diff --git a/constraints.php b/constraints.php
index 85776870df14a1747ad154087750a9da4d5b5857..f21009a661115d4b7aa58d4b85bd8034a3c3ce71 100644 (file)
--- a/constraints.php
+++ b/constraints.php
@@ -3,7 +3,7 @@
        /**
         * List constraints on a table
         *
-        * $Id: constraints.php,v 1.40 2004/09/07 13:58:21 jollytoad Exp $
+        * $Id: constraints.php,v 1.40.2.1 2005/10/18 03:15:57 chriskl Exp $
         */
 
        // Include application functions
@@ -49,7 +49,7 @@
                                        // because the table could be in another schema.
                                        if ($data->hasSchemas())
                                                $data->setSchema($_REQUEST['target']['schemaname']);
-                                       $attrs = &$data->getTableAttributes($_REQUEST['target']['tablename']);
+                                       $attrs = $data->getTableAttributes($_REQUEST['target']['tablename']);
                                        if ($data->hasSchemas())
                                                $data->setSchema($_REQUEST['schema']);
 
@@ -153,8 +153,8 @@
                                $misc->printTitle($lang['straddfk'],'pg.constraint.foreign_key');
                                $misc->printMsg($msg);
 
-                               $attrs = &$data->getTableAttributes($_REQUEST['table']);
-                               $tables = &$data->getTables(true);
+                               $attrs = $data->getTableAttributes($_REQUEST['table']);
+                               $tables = $data->getTables(true);
 
                                $selColumns = new XHTML_select('TableColumnList', true, 10);
                                $selColumns->set_style('width: 10em;');
@@ -244,9 +244,9 @@
                        
                        $misc->printMsg($msg);
                        
-                       $attrs = &$data->getTableAttributes($_REQUEST['table']);
+                       $attrs = $data->getTableAttributes($_REQUEST['table']);
                        // Fetch all tablespaces from the database
-                       if ($data->hasTablespaces()) $tablespaces = &$data->getTablespaces();
+                       if ($data->hasTablespaces()) $tablespaces = $data->getTablespaces();
 
                        
                        $selColumns = new XHTML_select('TableColumnList', true, 10);
@@ -438,7 +438,7 @@
                function cnPre(&$rowdata) {
                        global $data, $lang;
                        if (is_null($rowdata->f['consrc'])) {
-                               $atts = &$data->getAttributeNames($_REQUEST['table'], explode(' ', $rowdata->f['indkey']));
+                               $atts = $data->getAttributeNames($_REQUEST['table'], explode(' ', $rowdata->f['indkey']));
                                $rowdata->f['+definition'] = ($rowdata->f['contype'] == 'u' ? "UNIQUE (" : "PRIMARY KEY (") . join(',', $atts) . ')';
                        } else {
                                $rowdata->f['+definition'] = $rowdata->f['consrc'];
@@ -449,7 +449,7 @@
                $misc->printTabs('table','constraints');
                $misc->printMsg($msg);
 
-               $constraints = &$data->getConstraints($_REQUEST['table']);
+               $constraints = $data->getConstraints($_REQUEST['table']);
 
                $columns = array(
                        'constraint' => array(

diff --git a/conversions.php b/conversions.php
index 7437e0dc4b2a12d7867d18733521e176cc5ef6c6..24c786c3c8b376228bfb7073d51c2e6e3d7d35cb 100644 (file)
--- a/conversions.php
+++ b/conversions.php
@@ -3,7 +3,7 @@
        /**
         * Manage conversions in a database
         *
-        * $Id: conversions.php,v 1.9 2004/09/01 16:35:58 jollytoad Exp $
+        * $Id: conversions.php,v 1.9.2.1 2005/10/18 03:15:57 chriskl Exp $
         */
 
        // Include application functions
@@ -24,7 +24,7 @@
                $misc->printTabs('schema', 'conversions');
                $misc->printMsg($msg);
                
-               $conversions = &$data->getconversions();
+               $conversions = $data->getconversions();
                
                $columns = array(
                        'conversion' => array(

diff --git a/database.php b/database.php
index 09f20343316bd1a22bc8a2d25ed592059b6d182d..4879e3220baca3c3a3b6b94c97bc62556961601f 100755 (executable)
--- a/database.php
+++ b/database.php
@@ -3,7 +3,7 @@
        /**
         * Manage schemas within a database
         *
-        * $Id: database.php,v 1.64.2.1 2004/11/29 04:52:31 chriskl Exp $
+        * $Id: database.php,v 1.64.2.2 2005/10/18 03:15:57 chriskl Exp $
         */
 
        // Include application functions
@@ -84,7 +84,7 @@
                // If a search term has been specified, then perform the search
                // and display the results, grouped by object type
                if ($_GET['term'] != '') {
-                       $rs = &$data->findObject($_GET['term'], $_GET['filter']);
+                       $rs = $data->findObject($_GET['term'], $_GET['filter']);
                        if ($rs->recordCount() > 0) {
                                $curr = '';
                                while (!$rs->EOF) {
@@ -332,7 +332,7 @@
                global $lang;
 
                // Fetch the variables from the database
-               $variables = &$data->getVariables();
+               $variables = $data->getVariables();
                
                $misc->printTrail('database');
                $misc->printTabs('database','variables');
@@ -362,7 +362,7 @@
                global $lang;
 
                // Fetch the processes from the database
-               $processes = &$data->getProcesses($_REQUEST['database']);
+               $processes = $data->getProcesses($_REQUEST['database']);
                
                $misc->printTrail('database');
                $misc->printTabs('database','processes');
@@ -585,7 +585,7 @@
                if (!isset($_POST['formComment'])) $_POST['formComment'] = '';
 
                // Fetch all users from the database
-               $users = &$data->getUsers();
+               $users = $data->getUsers();
 
                $misc->printTrail('database');
                $misc->printTitle($lang['strcreateschema'],'pg.schema.create');
@@ -653,7 +653,7 @@
                
                // Check that the DB actually supports schemas
                if ($data->hasSchemas()) {
-                       $schemas = &$data->getSchemas();
+                       $schemas = $data->getSchemas();
 
                        $columns = array(
                                'schema' => array(
@@ -717,7 +717,7 @@
                $misc->printTitle($lang['stralter'],'pg.schema.alter');
                $misc->printMsg($msg);
 
-               $schema = &$data->getSchemaByName($_REQUEST['schema']);
+               $schema = $data->getSchemaByName($_REQUEST['schema']);
                if ($schema->recordCount() > 0) {
                        if (!isset($_POST['comment'])) $_POST['comment'] = $schema->f['nspcomment'];
                        if (!isset($_POST['schema'])) $_POST['schema'] = $_REQUEST['schema'];

diff --git a/dataexport.php b/dataexport.php
index 8e4b520f962078253a9ed7f86614de05957d9386..a2ecda43205c1912299179f56ce0074b88a1c3a2 100644 (file)
--- a/dataexport.php
+++ b/dataexport.php
@@ -4,7 +4,7 @@
         * Does an export to the screen or as a download.  This checks to
         * see if they have pg_dump set up, and will use it if possible.
         *
-        * $Id: dataexport.php,v 1.17.2.3 2005/07/15 08:09:20 chriskl Exp $
+        * $Id: dataexport.php,v 1.17.2.4 2005/10/18 03:15:57 chriskl Exp $
         */
 
        $extensions = array(
@@ -135,7 +135,7 @@
 
                        // Execute the query, if set, otherwise grab all rows from the table
                        if (isset($_REQUEST['table']))
-                               $rs = &$data->dumpRelation($_REQUEST['table'], $oids);
+                               $rs = $data->dumpRelation($_REQUEST['table'], $oids);
                        else
                                $rs = $data->conn->Execute($_REQUEST['query']);
 

diff --git a/display.php b/display.php
index 2ac45d6c1bebf17babddeac8872e9ce5b0cdb88b..9d07a76eb56db32724a61a865447a7c2c9af10c4 100644 (file)
--- a/display.php
+++ b/display.php
@@ -9,7 +9,7 @@
         * @param $return_desc The return link name
         * @param $page The current page
         *
-        * $Id: display.php,v 1.46.2.2 2005/03/04 02:32:44 chriskl Exp $
+        * $Id: display.php,v 1.46.2.3 2005/10/18 03:15:57 chriskl Exp $
         */
 
        // Prevent timeouts
@@ -38,8 +38,8 @@
                        $misc->printTitle($lang['streditrow']);
                        $misc->printMsg($msg);
 
-                       $attrs = &$data->getTableAttributes($_REQUEST['table']);
-                       $rs = &$data->browseRow($_REQUEST['table'], $key);
+                       $attrs = $data->getTableAttributes($_REQUEST['table']);
+                       $rs = $data->browseRow($_REQUEST['table'], $key);
 
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                        $elements = 0;
@@ -256,7 +256,7 @@
                }
 
                // Retrieve page from query.  $max_pages is returned by reference.
-               $rs = &$data->browseQuery($type, 
+               $rs = $data->browseQuery($type, 
                        isset($object) ? $object : null, 
                        isset($_REQUEST['query']) ? $_REQUEST['query'] : null, 
                        $_REQUEST['sortkey'], $_REQUEST['sortdir'], $_REQUEST['page'],

diff --git a/domains.php b/domains.php
index f9d5ef3a3f76f0439fdeac5428485bd6ccb585f8..eb08b7c04d92fab86d8a0d8189f1fc8152e01867 100644 (file)
--- a/domains.php
+++ b/domains.php
@@ -3,7 +3,7 @@
        /**
         * Manage domains in a database
         *
-        * $Id: domains.php,v 1.19 2004/09/07 13:58:21 jollytoad Exp $
+        * $Id: domains.php,v 1.19.2.1 2005/10/18 03:15:57 chriskl Exp $
         */
 
        // Include application functions
@@ -39,9 +39,9 @@
                $misc->printMsg($msg);
                
                // Fetch domain info
-               $domaindata = &$data->getDomain($_REQUEST['domain']);
+               $domaindata = $data->getDomain($_REQUEST['domain']);
                // Fetch all users
-               $users = &$data->getUsers();
+               $users = $data->getUsers();
                
                if ($domaindata->recordCount() > 0) {
                        if (!isset($_POST['domname'])) {                                
@@ -181,7 +181,7 @@
                $misc->printTitle($lang['strproperties'],'pg.domain');
                $misc->printMsg($msg);
                
-               $domaindata = &$data->getDomain($_REQUEST['domain']);
+               $domaindata = $data->getDomain($_REQUEST['domain']);
                
                if ($domaindata->recordCount() > 0) {
                        // Show comment if any
@@ -205,7 +205,7 @@
                        
                        // Display domain constraints
                        if ($data->hasDomainConstraints()) {
-                               $domaincons = &$data->getDomainConstraints($_REQUEST['domain']);
+                               $domaincons = $data->getDomainConstraints($_REQUEST['domain']);
                                if ($domaincons->recordCount() > 0) {
                                        echo "<h3>{$lang['strconstraints']}</h3>\n";
                                        echo "<table>\n";
@@ -290,7 +290,7 @@
                if (!isset($_POST['domdefault'])) $_POST['domdefault'] = '';
                if (!isset($_POST['domcheck'])) $_POST['domcheck'] = '';
 
-               $types = &$data->getTypes(true);
+               $types = $data->getTypes(true);
                
                $misc->printTrail('schema');
                $misc->printTitle($lang['strcreatedomain'],'pg.domain.create');
@@ -372,7 +372,7 @@
                $misc->printTabs('schema','domains');
                $misc->printMsg($msg);
                
-               $domains = &$data->getDomains();
+               $domains = $data->getDomains();
                
                $columns = array(
                        'domain' => array(

diff --git a/functions.php b/functions.php
index 066c78557d3ce29ebf8b8b9fa67b14a0049424c0..11625d2baa2e258ba3b8ddae42476762e13b1565 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -3,7 +3,7 @@
        /**
         * Manage functions in a database
         *
-        * $Id: functions.php,v 1.47.2.2 2005/08/11 12:20:38 xzilla Exp $
+        * $Id: functions.php,v 1.47.2.3 2005/10/18 03:15:57 chriskl Exp $
         */
 
        // Include application functions
@@ -51,7 +51,7 @@
                $misc->printTitle($lang['stralter'],'pg.function.alter');
                $misc->printMsg($msg);
 
-               $fndata = &$data->getFunction($_REQUEST['function_oid']);
+               $fndata = $data->getFunction($_REQUEST['function_oid']);
 
                if ($fndata->recordCount() > 0) {
                        $fndata->f['proretset'] = $data->phpBool($fndata->f['proretset']);
@@ -179,7 +179,7 @@
                $misc->printTitle($lang['strproperties'],'pg.function');
                $misc->printMsg($msg);
                
-               $funcdata = &$data->getFunction($_REQUEST['function_oid']);
+               $funcdata = $data->getFunction($_REQUEST['function_oid']);
                
                if ($funcdata->recordCount() > 0) {
                        // Deal with named parameters
@@ -321,8 +321,8 @@
                if (!isset($_POST['formSetOf'])) $_POST['formSetOf'] = '';
                if (!isset($_POST['formArray'])) $_POST['formArray'] = '';
 
-               $types = &$data->getTypes(true, true, true);
-               $langs = &$data->getLanguages(true);
+               $types = $data->getTypes(true, true, true);
+               $langs = $data->getLanguages(true);
                $fnlang = strtolower($_POST['formLanguage']);
 
                switch ($fnlang) {
@@ -480,7 +480,7 @@
                $misc->printTabs('schema','functions');
                $misc->printMsg($msg);
                
-               $funcs = &$data->getFunctions();
+               $funcs = $data->getFunctions();
                
                $columns = array(
                        'function' => array(

diff --git a/groups.php b/groups.php
index 8ba7318e6dc08847abd4e846a5a705482c198354..aa60f058078b2c89956ffbd1ef85f5b7881a7af7 100644 (file)
--- a/groups.php
+++ b/groups.php
@@ -3,7 +3,7 @@
        /**
         * Manage groups in a database cluster
         *
-        * $Id: groups.php,v 1.19 2004/09/07 13:58:21 jollytoad Exp $
+        * $Id: groups.php,v 1.19.2.1 2005/10/18 03:15:57 chriskl Exp $
         */
 
        // Include application functions
@@ -70,8 +70,8 @@
                $misc->printTitle($lang['strproperties'],'pg.group');
                $misc->printMsg($msg);
                
-               $groupdata = &$data->getGroup($_REQUEST['group']);
-               $users = &$data->getUsers();
+               $groupdata = $data->getGroup($_REQUEST['group']);
+               $users = $data->getUsers();
                
                if ($groupdata->recordCount() > 0) {
                        echo "<table>\n";
@@ -148,7 +148,7 @@
                if (!isset($_POST['members'])) $_POST['members'] = array();
 
                // Fetch a list of all users in the cluster
-               $users = &$data->getUsers();
+               $users = $data->getUsers();
                
                $misc->printTrail('server');
                $misc->printTitle($lang['strcreategroup'],'pg.group.create');
@@ -211,7 +211,7 @@
                $misc->printTabs('server','groups');
                $misc->printMsg($msg);
                
-               $groups = &$data->getGroups();
+               $groups = $data->getGroups();
                
                $columns = array(
                        'group' => array(

diff --git a/help.php b/help.php
index 3b8d2921b7608cbdbd8393b7c29bf64b60f6ae00..2c876f0b366093ad1bb52dd0337c9bb939877474 100644 (file)
--- a/help.php
+++ b/help.php
@@ -3,7 +3,7 @@
        /**
         * Help page redirection/browsing.
         *
-        * $Id: help.php,v 1.1 2004/09/07 13:57:26 jollytoad Exp $
+        * $Id: help.php,v 1.1.2.1 2005/10/18 03:15:57 chriskl Exp $
         */
 
        # TODO: Localize messages, improve (or remove) help browser
@@ -46,7 +46,7 @@
                
                echo "<dl>\n";
                
-               $pages =& $data->getHelpPages();
+               $pages = $data->getHelpPages();
                foreach ($pages as $page => $dummy) {
                        echo "<dt>{$page}</dt>\n";
                        

diff --git a/indexes.php b/indexes.php
index a3c1d7c73fc3a42abdf9851776fa7c4d02828025..6bcc76277015797ef19bd009299ceaa0ec7ff154 100644 (file)
--- a/indexes.php
+++ b/indexes.php
@@ -3,7 +3,7 @@
        /**
         * List indexes on a table
         *
-        * $Id: indexes.php,v 1.34 2004/09/07 13:58:21 jollytoad Exp $
+        * $Id: indexes.php,v 1.34.2.1 2005/10/18 03:15:57 chriskl Exp $
         */
 
        // Include application functions
@@ -79,9 +79,9 @@
                if (!isset($_POST['formWhere'])) $_POST['formWhere'] = '';
                if (!isset($_POST['formSpc'])) $_POST['formSpc'] = '';
 
-               $attrs = &$data->getTableAttributes($_REQUEST['table']);
+               $attrs = $data->getTableAttributes($_REQUEST['table']);
                // Fetch all tablespaces from the database
-               if ($data->hasTablespaces()) $tablespaces = &$data->getTablespaces();
+               if ($data->hasTablespaces()) $tablespaces = $data->getTablespaces();
                
                $misc->printTrail('table');
                $misc->printTitle($lang['strcreateindex'],'pg.index.create');
@@ -259,7 +259,7 @@
                $misc->printTabs('table','indexes');
                $misc->printMsg($msg);
 
-               $indexes = &$data->getIndexes($_REQUEST['table']);
+               $indexes = $data->getIndexes($_REQUEST['table']);
                
                $columns = array(
                        'index' => array(

diff --git a/info.php b/info.php
index 81a38f48b729c2425c648b6f980978eda8994a71..21705be069fb9055b3c4b07cf60590f7c0435103 100644 (file)
--- a/info.php
+++ b/info.php
@@ -3,7 +3,7 @@
        /**
         * List extra information on a table
         *
-        * $Id: info.php,v 1.9 2004/09/01 16:35:58 jollytoad Exp $
+        * $Id: info.php,v 1.9.2.1 2005/10/18 03:15:57 chriskl Exp $
         */
 
        // Include application functions
@@ -27,14 +27,14 @@
                $shownull = array('null' => true);
 
                // Fetch info
-               $referrers = &$data->getReferrers($_REQUEST['table']);
-               $parents = &$data->getTableParents($_REQUEST['table']);
-               $children = &$data->getTableChildren($_REQUEST['table']);
+               $referrers = $data->getReferrers($_REQUEST['table']);
+               $parents = $data->getTableParents($_REQUEST['table']);
+               $children = $data->getTableChildren($_REQUEST['table']);
                if ($data->hasStatsCollector()) {
-               $tablestatstups = &$data->getStatsTableTuples($_REQUEST['table']);
-               $tablestatsio = &$data->getStatsTableIO($_REQUEST['table']);
-               $indexstatstups = &$data->getStatsIndexTuples($_REQUEST['table']);
-               $indexstatsio = &$data->getStatsIndexIO($_REQUEST['table']);
+               $tablestatstups = $data->getStatsTableTuples($_REQUEST['table']);
+               $tablestatsio = $data->getStatsTableIO($_REQUEST['table']);
+               $indexstatstups = $data->getStatsIndexTuples($_REQUEST['table']);
+               $indexstatsio = $data->getStatsIndexIO($_REQUEST['table']);
         }
         
                // Check that there is some info

diff --git a/languages.php b/languages.php
index 5b48cc9620334ee9bfdca33a0659f2bb73ec88d9..5f706ba32c2d088dd2a7620f108350cc09f3b1e4 100644 (file)
--- a/languages.php
+++ b/languages.php
@@ -3,7 +3,7 @@
        /**
         * Manage languages in a database
         *
-        * $Id: languages.php,v 1.7 2004/09/01 16:35:59 jollytoad Exp $
+        * $Id: languages.php,v 1.7.2.1 2005/10/18 03:15:57 chriskl Exp $
         */
 
        // Include application functions
@@ -24,7 +24,7 @@
                $misc->printTabs('database','languages');
                $misc->printMsg($msg);
                
-               $languages = &$data->getlanguages();
+               $languages = $data->getlanguages();
 
                $columns = array(
                        'language' => array(

diff --git a/opclasses.php b/opclasses.php
index 9924358264b1ac7f3fa109cc96dca3b92737df2a..18e443b537a213ee57f1c8d086c1a328abb568e4 100644 (file)
--- a/opclasses.php
+++ b/opclasses.php
@@ -3,7 +3,7 @@
        /**
         * Manage opclasss in a database
         *
-        * $Id: opclasses.php,v 1.6 2004/09/01 16:35:59 jollytoad Exp $
+        * $Id: opclasses.php,v 1.6.2.1 2005/10/18 03:15:57 chriskl Exp $
         */
 
        // Include application functions
@@ -23,7 +23,7 @@
                $misc->printTabs('schema','opclasses');
                $misc->printMsg($msg);
                
-               $opclasses = &$data->getOpClasses();
+               $opclasses = $data->getOpClasses();
                
                $columns = array(
                        'accessmethod' => array(

diff --git a/operators.php b/operators.php
index 75300e269816d865b4618c11650df10ffee3ba58..d0520295e133b4cef468643e001b91ddff413221 100644 (file)
--- a/operators.php
+++ b/operators.php
@@ -3,7 +3,7 @@
        /**
         * Manage operators in a database
         *
-        * $Id: operators.php,v 1.17 2004/09/07 13:58:21 jollytoad Exp $
+        * $Id: operators.php,v 1.17.2.1 2005/10/18 03:15:57 chriskl Exp $
         */
 
        // Include application functions
@@ -24,7 +24,7 @@
                $misc->printTitle($lang['strproperties'],'pg.operator');
                $misc->printMsg($msg);
                
-               $oprdata = &$data->getOperator($_REQUEST['operator_oid']);
+               $oprdata = $data->getOperator($_REQUEST['operator_oid']);
                $oprdata->f['oprcanhash'] = $data->phpBool($oprdata->f['oprcanhash']);
 
                if ($oprdata->recordCount() > 0) {
@@ -110,7 +110,7 @@
                $misc->printTabs('schema','operators');
                $misc->printMsg($msg);
                
-               $operators = &$data->getOperators();
+               $operators = $data->getOperators();
 
                $columns = array(
                        'operator' => array(

diff --git a/privileges.php b/privileges.php
index 4db391e282fa68976696ad234225e19b4a11555a..196245089b8abd06d10b08af6d0aacfb29b165e3 100644 (file)
--- a/privileges.php
+++ b/privileges.php
@@ -3,7 +3,7 @@
        /**
         * Manage privileges in a database
         *
-        * $Id: privileges.php,v 1.34.2.3 2005/08/11 12:43:06 xzilla Exp $
+        * $Id: privileges.php,v 1.34.2.4 2005/10/18 03:15:57 chriskl Exp $
         */
 
        // Include application functions
@@ -29,9 +29,9 @@
        
                if ($confirm) {
                        // Get users from the database
-                       $users = &$data->getUsers();
+                       $users = $data->getUsers();
                        // Get groups from the database
-                       $groups = &$data->getGroups();
+                       $groups = $data->getGroups();
                
                        $misc->printTrail($_REQUEST['subject']);
                        

diff --git a/reports.php b/reports.php
index df78fe6c00c60d9e78e381c351b6581c491d22fa..9e730e51214d989ecc9017d95c6a60094f8c2577 100644 (file)
--- a/reports.php
+++ b/reports.php
@@ -3,7 +3,7 @@
        /**
         * List reports in a database
         *
-        * $Id: reports.php,v 1.19 2004/09/02 13:53:56 jollytoad Exp $
+        * $Id: reports.php,v 1.19.2.1 2005/10/18 03:15:57 chriskl Exp $
         */
 
        // Include application functions
@@ -20,7 +20,7 @@
                global $PHP_SELF, $lang;
 
                // If it's a first, load then get the data from the database
-               $report = &$reportsdb->getReport($_REQUEST['report_id']);
+               $report = $reportsdb->getReport($_REQUEST['report_id']);
                if ($_REQUEST['action'] == 'edit') {                    
                        $_POST['report_name'] = $report->f['report_name'];
                        $_POST['db_name'] = $report->f['db_name'];
@@ -29,7 +29,7 @@
                }
 
                // Get a list of available databases
-               $databases = &$data->getDatabases();
+               $databases = $data->getDatabases();
 
                $_REQUEST['report'] = $report->f['report_name'];
                $misc->printTrail('report');
@@ -133,7 +133,7 @@
                if (!isset($_REQUEST['descr'])) $_REQUEST['descr'] = '';
                if (!isset($_REQUEST['report_sql'])) $_REQUEST['report_sql'] = '';
 
-               $databases = &$data->getDatabases();
+               $databases = $data->getDatabases();
 
                $misc->printTrail('server');
                $misc->printTitle($lang['strcreatereport']);
@@ -201,7 +201,7 @@
 
                if ($confirm) {
                        // Fetch report from the database
-                       $report = &$reportsdb->getReport($_REQUEST['report_id']);
+                       $report = $reportsdb->getReport($_REQUEST['report_id']);
 
                        $_REQUEST['report'] = $report->f['report_name'];
                        $misc->printTrail('report');
@@ -237,7 +237,7 @@
                $misc->printTitle($lang['strreports']);
                $misc->printMsg($msg);
                
-               $reports = &$reportsdb->getReports();
+               $reports = $reportsdb->getReports();
                
                $columns = array(
                        'report' => array(

diff --git a/rules.php b/rules.php
index 22147fc30772cfb0d2a3b4ed0c2c19302457829a..8bfc89157e18702c80bc577c7f6adb4c603c2156 100644 (file)
--- a/rules.php
+++ b/rules.php
@@ -3,7 +3,7 @@
        /**
         * List rules on a table OR view
         *
-        * $Id: rules.php,v 1.24 2004/09/28 13:08:39 jollytoad Exp $
+        * $Id: rules.php,v 1.24.2.1 2005/10/18 03:15:57 chriskl Exp $
         */
 
        // Include application functions
@@ -133,7 +133,7 @@
                $misc->printTabs($_REQUEST['subject'], 'rules');
                $misc->printMsg($msg);
 
-               $rules = &$data->getRules($_REQUEST[$_REQUEST['subject']]);
+               $rules = $data->getRules($_REQUEST[$_REQUEST['subject']]);
 
                $columns = array(
                        'rule' => array(

diff --git a/sequences.php b/sequences.php
index ac4a8096d2c1ce0fba3194b8a01e60474e1f00e5..4b03bf4e16327fb638ee623e5735ed2fe05381e9 100644 (file)
--- a/sequences.php
+++ b/sequences.php
@@ -3,7 +3,7 @@
        /**
         * Manage sequences in a database
         *
-        * $Id: sequences.php,v 1.27 2004/09/07 13:58:21 jollytoad Exp $
+        * $Id: sequences.php,v 1.27.2.1 2005/10/18 03:15:57 chriskl Exp $
         */
        
        // Include application functions
@@ -25,7 +25,7 @@
                $misc->printMsg($msg);
                
                // Get all sequences
-               $sequences = &$data->getSequences();
+               $sequences = $data->getSequences();
                
                $columns = array(
                        'sequence' => array(
@@ -80,7 +80,7 @@
                $misc->printMsg($msg);
                
                // Fetch the sequence information
-               $sequence = &$data->getSequence($_REQUEST['sequence']);         
+               $sequence = $data->getSequence($_REQUEST['sequence']);          
                
                if (is_object($sequence) && $sequence->recordCount() > 0) {
                        $sequence->f['is_cycled'] = $data->phpBool($sequence->f['is_cycled']);

diff --git a/sqledit.php b/sqledit.php
index 1480b95ea367808560e799b9382ae9dafc1ab207..a6eba668e737f9732f4b2b2a7fec7729e5301cb5 100644 (file)
--- a/sqledit.php
+++ b/sqledit.php
@@ -3,7 +3,7 @@
        /**
         * Alternative SQL editing window
         *
-        * $Id: sqledit.php,v 1.25 2004/09/30 16:32:05 jollytoad Exp $
+        * $Id: sqledit.php,v 1.25.2.1 2005/10/18 03:15:57 chriskl Exp $
         */
 
        // Include application functions
@@ -20,7 +20,7 @@
                global $data, $lang, $conf, $action, $misc;
 
                // Get the list of all databases
-               $databases = &$data->getDatabases();
+               $databases = $data->getDatabases();
 
                if ($databases->recordCount() > 0) {                    
                        // The javascript action on the select box reloads the popup whenever the database is changed.

diff --git a/tables.php b/tables.php
index 5a665d672836a7113007a6c2a587f3e9e07f3b50..81365308671ca329327c694d49deaaeb115a036c 100644 (file)
--- a/tables.php
+++ b/tables.php
@@ -3,7 +3,7 @@
        /**
         * List tables in a database
         *
-        * $Id: tables.php,v 1.68 2004/10/11 10:29:15 jollytoad Exp $
+        * $Id: tables.php,v 1.68.2.1 2005/10/18 03:15:57 chriskl Exp $
         */
 
        // Include application functions
@@ -28,7 +28,7 @@
                switch ($_REQUEST['stage']) {
                        case 1:
                                // Fetch all tablespaces from the database
-                               if ($data->hasTablespaces()) $tablespaces = &$data->getTablespaces();
+                               if ($data->hasTablespaces()) $tablespaces = $data->getTablespaces();
                                
                                $misc->printTrail('schema');
                                $misc->printTitle($lang['strcreatetable'], 'pg.table.create');
@@ -93,7 +93,7 @@
                                        return;
                                }
 
-                               $types = &$data->getTypes(true, false, true);
+                               $types = $data->getTypes(true, false, true);
        
                                $misc->printTrail('schema');
                                $misc->printTitle($lang['strcreatetable'], 'pg.table.create');
@@ -221,7 +221,7 @@
                        $misc->printTitle($lang['strselect'], 'pg.sql.select');
                        $misc->printMsg($msg);
 
-                       $attrs = &$data->getTableAttributes($_REQUEST['table']);
+                       $attrs = $data->getTableAttributes($_REQUEST['table']);
 
                        echo "<form action=\"$PHP_SELF\" method=\"post\" name=\"selectform\">\n";
                        if ($attrs->recordCount() > 0) {
@@ -330,7 +330,7 @@
                        $misc->printTitle($lang['strinsertrow'], 'pg.sql.insert');
                        $misc->printMsg($msg);
 
-                       $attrs = &$data->getTableAttributes($_REQUEST['table']);
+                       $attrs = $data->getTableAttributes($_REQUEST['table']);
 
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                        if ($attrs->recordCount() > 0) {
@@ -530,7 +530,7 @@
                $misc->printTabs('schema','tables');
                $misc->printMsg($msg);
                
-               $tables = &$data->getTables();
+               $tables = $data->getTables();
                
                $columns = array(
                        'table' => array(

diff --git a/tablespaces.php b/tablespaces.php
index c31c3fbd4b03f3045162d10a668957664e8d10b6..dd7e11547483b9c024f2e092a4c04ff489a97c96 100755 (executable)
--- a/tablespaces.php
+++ b/tablespaces.php
@@ -3,7 +3,7 @@
        /**
         * Manage tablespaces in a database cluster
         *
-        * $Id: tablespaces.php,v 1.6 2004/09/07 13:58:21 jollytoad Exp $
+        * $Id: tablespaces.php,v 1.6.2.1 2005/10/18 03:15:57 chriskl Exp $
         */
 
        // Include application functions
@@ -25,9 +25,9 @@
                $misc->printMsg($msg);
 
                // Fetch tablespace info                
-               $tablespace = &$data->getTablespace($_REQUEST['tablespace']);
+               $tablespace = $data->getTablespace($_REQUEST['tablespace']);
                // Fetch all users              
-               $users = &$data->getUsers();
+               $users = $data->getUsers();
                
                if ($tablespace->recordCount() > 0) {
                        
@@ -125,7 +125,7 @@
                if (!isset($_POST['formLoc'])) $_POST['formLoc'] = '';
 
                // Fetch all users
-               $users = &$data->getUsers();
+               $users = $data->getUsers();
                
                $misc->printTrail('server');
                $misc->printTitle($lang['strcreatetablespace'],'pg.tablespace.create');
@@ -185,7 +185,7 @@
                $misc->printTabs('server','tablespaces');
                $misc->printMsg($msg);
                
-               $tablespaces = &$data->getTablespaces();
+               $tablespaces = $data->getTablespaces();
 
                $columns = array(
                        'database' => array(

diff --git a/tblproperties.php b/tblproperties.php
index a11982dd524dfaae3a7443bc8492bcae11824a95..d1fffe80c1e850c4630321f7c0a48de237a15caa 100644 (file)
--- a/tblproperties.php
+++ b/tblproperties.php
@@ -3,7 +3,7 @@
        /**
         * List tables in a database
         *
-        * $Id: tblproperties.php,v 1.62 2004/11/02 03:33:35 chriskl Exp $
+        * $Id: tblproperties.php,v 1.62.2.1 2005/10/18 03:15:57 chriskl Exp $
         */
 
        // Include application functions
@@ -51,11 +51,11 @@
                $misc->printMsg($msg);
 
                // Fetch table info             
-               $table = &$data->getTable($_REQUEST['table']);
+               $table = $data->getTable($_REQUEST['table']);
                // Fetch all users
-               $users = &$data->getUsers();
+               $users = $data->getUsers();
                // Fetch all tablespaces from the database
-               if ($data->hasTablespaces()) $tablespaces = &$data->getTablespaces(true);
+               if ($data->hasTablespaces()) $tablespaces = $data->getTablespaces(true);
                
                if ($table->recordCount() > 0) {
                        
@@ -231,7 +231,7 @@
                                if (!isset($_POST['comment'])) $_POST['comment'] = '';
 
                                // Fetch all available types
-                               $types = &$data->getTypes(true, false, true);
+                               $types = $data->getTypes(true, false, true);
 
                                $misc->printTrail('table');
                                $misc->printTitle($lang['straddcolumn'], 'pg.column.add');
@@ -352,7 +352,7 @@
                                }
                                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 = $data->getTableAttributes($_REQUEST['table'], $_REQUEST['column']);
                                $column->f['attnotnull'] = $data->phpBool($column->f['attnotnull']);
 
                                // Upon first drawing the screen, load the existing column information
@@ -389,7 +389,7 @@
                                // Column type
                                if ($data->hasAlterColumnType()) {
                                        // Fetch all available types
-                                       $types = &$data->getTypes(true, false, true);
+                                       $types = $data->getTypes(true, false, true);
                                        
                                        echo "<td><select name=\"type\">\n";                            
                                        // Output any "magic" types.  This came in with Alter Column Type so we don't need to check that
@@ -528,9 +528,9 @@
                $misc->printMsg($msg);
 
                // Get table
-               $tdata = &$data->getTable($_REQUEST['table']);
+               $tdata = $data->getTable($_REQUEST['table']);
                // Get columns
-               $attrs = &$data->getTableAttributes($_REQUEST['table']);                
+               $attrs = $data->getTableAttributes($_REQUEST['table']);         
 
                // Show comment if any
                if ($tdata->f['relcomment'] !== null)

diff --git a/triggers.php b/triggers.php
index 332b3283b644c922fac4909902c47f30f00da5ea..233ffa3a2a84ed542cbaa6fdca524e0a676ab2e2 100644 (file)
--- a/triggers.php
+++ b/triggers.php
@@ -3,7 +3,7 @@
        /**
         * List triggers on a table
         *
-        * $Id: triggers.php,v 1.24 2004/09/28 13:09:31 jollytoad Exp $
+        * $Id: triggers.php,v 1.24.2.1 2005/10/18 03:15:57 chriskl Exp $
         */
 
        // Include application functions
@@ -37,7 +37,7 @@
                $misc->printTitle($lang['stralter'],'pg.trigger.alter');
                $misc->printMsg($msg);
                
-               $triggerdata = &$data->getTrigger($_REQUEST['table'], $_REQUEST['trigger']);
+               $triggerdata = $data->getTrigger($_REQUEST['table'], $_REQUEST['trigger']);
                
                if ($triggerdata->recordCount() > 0) {
                        
@@ -110,7 +110,7 @@
                $misc->printMsg($msg);
                
                // Get all the functions that can be used in triggers
-               $funcs = &$data->getTriggerFunctions();
+               $funcs = $data->getTriggerFunctions();
                if ($funcs->recordCount() == 0) {
                        doDefault($lang['strnofunctions']);
                        return;
@@ -172,7 +172,7 @@
                elseif ($_POST['formEvent'] == '') 
                        doCreate();
                else {           
-                       $status = &$data->createTrigger($_POST['formTriggerName'], $_POST['table'],
+                       $status = $data->createTrigger($_POST['formTriggerName'], $_POST['table'],
                                        $_POST['formFunction'], $_POST['formExecTime'], $_POST['formEvent'],
                                        $_POST['formTriggerArgs']);
                        if ($status == 0)
@@ -202,7 +202,7 @@
                $misc->printTabs('table','triggers');
                $misc->printMsg($msg);
 
-               $triggers = &$data->getTriggers($_REQUEST['table']);
+               $triggers = $data->getTriggers($_REQUEST['table']);
 
                $columns = array(
                        'trigger' => array(

diff --git a/types.php b/types.php
index 682545bd0826fd8639fd06d08a8601a151860f37..8268531974fa3b573a6f0d7b9256f3961a05b940 100644 (file)
--- a/types.php
+++ b/types.php
@@ -3,7 +3,7 @@
        /**
         * Manage types in a database
         *
-        * $Id: types.php,v 1.25.2.1 2005/03/14 11:08:46 jollytoad Exp $
+        * $Id: types.php,v 1.25.2.2 2005/10/18 03:15:57 chriskl Exp $
         */
 
        // Include application functions
@@ -21,7 +21,7 @@
                global $PHP_SELF, $lang;
 
                // Get type (using base name)
-               $typedata = &$data->getType($_REQUEST['type']);
+               $typedata = $data->getType($_REQUEST['type']);
 
                $misc->printTrail('type');
                $misc->printTitle($lang['strproperties'], 'pg.type');
@@ -35,7 +35,7 @@
                if ($typedata->recordCount() > 0) {
                        switch ($typedata->f['typtype']) {
                        case 'c':
-                               $attrs = &$data->getTableAttributes($_REQUEST['type']);
+                               $attrs = $data->getTableAttributes($_REQUEST['type']);
                                
                                $columns = array(
                                        'field' => array(
@@ -171,7 +171,7 @@
                                        return;
                                }
 
-                               $types = &$data->getTypes(true, false, true);
+                               $types = $data->getTypes(true, false, true);
 
                                $misc->printTrail('type');
                                $misc->printTitle($lang['strcreatecomptype'], 'pg.type.create');
@@ -282,8 +282,8 @@
                if (!isset($_POST['typstorage'])) $_POST['typstorage'] = $data->typStorageDef;
 
                // Retrieve all functions and types in the database
-               $funcs = &$data->getFunctions(true);
-               $types = &$data->getTypes(true);
+               $funcs = $data->getFunctions(true);
+               $types = $data->getTypes(true);
 
                $misc->printTrail('schema');
                $misc->printTitle($lang['strcreatetype'], 'pg.type.create');
@@ -400,7 +400,7 @@
                $misc->printTabs('schema','types');
                $misc->printMsg($msg);
                
-               $types = &$data->getTypes();
+               $types = $data->getTypes();
 
                $columns = array(
                        'type' => array(

diff --git a/users.php b/users.php
index dea93ce51dc41ce39beba7152e10335142120b4a..3a253100934ec91cc213a1a3b99e0063c9e80d75 100644 (file)
--- a/users.php
+++ b/users.php
@@ -3,7 +3,7 @@
        /**
         * Manage users in a database cluster
         *
-        * $Id: users.php,v 1.29 2004/09/07 13:58:21 jollytoad Exp $
+        * $Id: users.php,v 1.29.2.1 2005/10/18 03:15:57 chriskl Exp $
         */
 
        // Include application functions
@@ -23,7 +23,7 @@
                global $data, $misc;
                global $PHP_SELF, $lang;
                
-               $userdata = &$data->getUser($_SESSION['webdbUsername']);
+               $userdata = $data->getUser($_SESSION['webdbUsername']);
                $_REQUEST['user'] = $_SESSION['webdbUsername'];
                
                $misc->printTrail('user');
@@ -107,7 +107,7 @@
                $misc->printTitle($lang['stralter'],'pg.user.alter');
                $misc->printMsg($msg);
                
-               $userdata = &$data->getUser($_REQUEST['username']);
+               $userdata = $data->getUser($_REQUEST['username']);
                
                if ($userdata->recordCount() > 0) {
                        $canRename = $data->hasUserRename() && ($_REQUEST['username'] != $_SESSION['webdbUsername']);
@@ -274,7 +274,7 @@
                $misc->printTabs('server','users');
                $misc->printMsg($msg);
                
-               $users = &$data->getUsers();
+               $users = $data->getUsers();
                
                $columns = array(
                        'user' => array(

diff --git a/viewproperties.php b/viewproperties.php
index cb52ba944d7ff9218b45f1aa3cb09b617af8b127..ee9c3c4b2eab01badd41058588415788232afe78 100755 (executable)
--- a/viewproperties.php
+++ b/viewproperties.php
@@ -3,7 +3,7 @@
        /**
         * List views in a database
         *
-        * $Id: viewproperties.php,v 1.13 2004/09/07 13:58:21 jollytoad Exp $
+        * $Id: viewproperties.php,v 1.13.2.1 2005/10/18 03:15:57 chriskl Exp $
         */
 
        // Include application functions
@@ -36,7 +36,7 @@
                $misc->printTitle($lang['stredit'],'pg.view.alter');
                $misc->printMsg($msg);
                
-               $viewdata = &$data->getView($_REQUEST['view']);
+               $viewdata = $data->getView($_REQUEST['view']);
                
                if ($viewdata->recordCount() > 0) {
                        
@@ -132,7 +132,7 @@
                global $PHP_SELF, $lang;
        
                // Get view
-               $vdata = &$data->getView($_REQUEST['view']);
+               $vdata = $data->getView($_REQUEST['view']);
 
                $misc->printTrail('view');
                $misc->printTabs('view','definition');
@@ -178,7 +178,7 @@
                                echo "<tr><th class=\"data required\">{$lang['strname']}</th><th class=\"data required\">{$lang['strtype']}</th>";
                                echo "<th class=\"data\">{$lang['strdefault']}</th><th class=\"data\">{$lang['strcomment']}</th></tr>";
 
-                               $column = &$data->getTableAttributes($_REQUEST['view'], $_REQUEST['column']);
+                               $column = $data->getTableAttributes($_REQUEST['view'], $_REQUEST['column']);
 
                                if (!isset($_REQUEST['default'])) {
                                        $_REQUEST['field'] = $column->f['attname'];
@@ -259,9 +259,9 @@
                $misc->printMsg($msg);
 
                // Get view
-               $vdata = &$data->getView($_REQUEST['view']);
+               $vdata = $data->getView($_REQUEST['view']);
                // Get columns (using same method for getting a view)
-               $attrs = &$data->getTableAttributes($_REQUEST['view']);         
+               $attrs = $data->getTableAttributes($_REQUEST['view']);          
 
                // Show comment if any
                if ($vdata->f['relcomment'] !== null)

diff --git a/views.php b/views.php
index ec057e03f0b3e6385e5a351a250d837e77a1edac..ee50ec722465553f119a86acc608741401b8863b 100644 (file)
--- a/views.php
+++ b/views.php
@@ -3,7 +3,7 @@
        /**
         * Manage views in a database
         *
-        * $Id: views.php,v 1.51 2004/09/07 13:58:21 jollytoad Exp $
+        * $Id: views.php,v 1.51.2.1 2005/10/18 03:15:57 chriskl Exp $
         */
 
        // Include application functions
@@ -27,7 +27,7 @@
                        $misc->printTitle($lang['strselect'], 'pg.sql.select');
                        $misc->printMsg($msg);
 
-                       $attrs = &$data->getTableAttributes($_REQUEST['view']);
+                       $attrs = $data->getTableAttributes($_REQUEST['view']);
 
                        echo "<form action=\"$PHP_SELF\" method=\"get\" name=\"selectform\">\n";
                        if ($attrs->recordCount() > 0) {
@@ -201,7 +201,7 @@
                                        $data->setSchema($arrSelTables[$i]['schemaname']);
                                }
                                
-                               $attrs = &$data->getTableAttributes($arrSelTables[$i]['tablename']);
+                               $attrs = $data->getTableAttributes($arrSelTables[$i]['tablename']);
                                while (!$attrs->EOF) {
                                        if ($data->hasSchemas() ) {
                                                $arrFields["{$arrSelTables[$i]['schemaname']}.{$arrSelTables[$i]['tablename']}.{$attrs->f['attname']}"] = serialize(array('schemaname' => $arrSelTables[$i]['schemaname'], 'tablename' => $arrSelTables[$i]['tablename'], 'fieldname' => $attrs->f['attname']) );
@@ -308,7 +308,7 @@
                global $data, $misc;
                global $PHP_SELF, $lang;
                
-               $tables = &$data->getTables(true);
+               $tables = $data->getTables(true);
                
                $misc->printTrail('schema');
                $misc->printTitle($lang['strcreateviewwiz'], 'pg.view.create');
@@ -525,7 +525,7 @@
                $misc->printTabs('schema','views');
                $misc->printMsg($msg);
                
-               $views = &$data->getViews();
+               $views = $data->getViews();
                
                $columns = array(
                        'view' => array(