Attempt to fix PHP 4.4.0 strict references. Needs testing.

38 files changed, 202 insertions, 195 deletions

diff --git a/DEVELOPERS b/DEVELOPERS
index 5e463a99..d8d94372 100644
--- 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/HISTORY b/HISTORY
index 6718d26a..76996d87 100644
--- a/HISTORY
+++ b/HISTORY
@@ -48,12 +48,19 @@ Bugs
 * Fix bug with exporting schema for servers < 7.3
 * Fix opclasses on 7.2 and below
 * Fix listing of opaque functions in 7.2
+* Actually fix PHP 4.4.0's new strict references
 
 Translations
 * Japanese from Tadashi Jokagi
 * Danish from Arne Eckmann
 * Arabic from Zaki
 
+Version 3.5.6
+-------------
+
+Bugs
+* Actually fix PHP 4.4.0's new strict references
+
 Version 3.5.5
 -------------
 
diff --git a/aggregates.php b/aggregates.php
index 81a6d21e..94d1abd2 100644
--- a/aggregates.php
+++ b/aggregates.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage aggregates in a database
 	 *
-	 * $Id: aggregates.php,v 1.11 2005/05/02 15:47:23 chriskl Exp $
+	 * $Id: aggregates.php,v 1.12 2005/10/18 03:45:15 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(
@@ -52,7 +52,7 @@
 	function doTree() {
 		global $misc, $data;
 		
-		$aggregates = &$data->getAggregates();
+		$aggregates = $data->getAggregates();
 		
 		$proto = concat(field('proname'), ' (', field('proargtypes'), ')');
 		
diff --git a/all_db.php b/all_db.php
index 1bd07da6..db24e015 100644
--- a/all_db.php
+++ b/all_db.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage databases within a server
 	 *
-	 * $Id: all_db.php,v 1.40 2005/05/05 08:59:52 jollytoad Exp $
+	 * $Id: all_db.php,v 1.41 2005/10/18 03:45:15 chriskl Exp $
 	 */
 
 	// Include application functions
@@ -38,7 +38,7 @@
 				
 				$rs = $data->getDatabaseOwner($_REQUEST['alterdatabase']);
 				$owner = isset($rs->fields['usename']) ? $rs->fields['usename'] : '';
-				$users = &$data->getUsers();
+				$users = $data->getUsers();
 				
 				echo "<tr><th class=\"data left required\">{$lang['strowner']}</th>\n";
 				echo "<td class=\"data1\"><select name=\"owner\">";
@@ -124,7 +124,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";
@@ -250,7 +250,7 @@
 		$misc->printTabs('server','databases');
 		$misc->printMsg($msg);
 		
-		$databases = &$data->getDatabases();
+		$databases = $data->getDatabases();
 
 		$columns = array(
 			'database' => array(
@@ -315,7 +315,7 @@
 	function doTree() {
 		global $misc, $data, $lang;
 		
-		$databases = &$data->getDatabases();
+		$databases = $data->getDatabases();
 		
 		$reqvars = $misc->getRequestVars('database');
 		
diff --git a/casts.php b/casts.php
index 8445a865..2f3dd55d 100644
--- a/casts.php
+++ b/casts.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage casts in a database
 	 *
-	 * $Id: casts.php,v 1.10 2005/06/29 05:11:44 chriskl Exp $
+	 * $Id: casts.php,v 1.11 2005/10/18 03:45:15 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(
@@ -68,7 +68,7 @@
 	function doTree() {
 		global $misc, $data;
 		
-		$casts = &$data->getCasts();
+		$casts = $data->getCasts();
 		
 		$proto = concat(field('castsource'), ' AS ', field('casttarget'));
 		
diff --git a/classes/Reports.php b/classes/Reports.php
index 36e766db..b6d12d9c 100644
--- 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.13 2005/07/31 09:15:06 chriskl Exp $
+	 * $Id: Reports.php,v 1.14 2005/10/18 03:45:16 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 5755f2be..7b5666e6 100755
--- 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.276 2005/10/17 08:45:49 jollytoad Exp $
+ * $Id: Postgres.php,v 1.277 2005/10/18 03:45:16 chriskl Exp $
  */
 
 // @@@ THOUGHT: What about inherits? ie. use of ONLY???
@@ -855,7 +855,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;
@@ -878,7 +878,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;
@@ -963,7 +963,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;
@@ -971,14 +971,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;
@@ -1053,11 +1053,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:
@@ -1085,7 +1085,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) {
@@ -1164,7 +1164,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;
@@ -1273,7 +1273,7 @@ class Postgres extends ADODB_base {
 		$sql = '';
 
 		// Indexes
-		$indexes = &$this->getIndexes($table);
+		$indexes = $this->getIndexes($table);
 		if (!is_object($indexes)) {
 			$this->rollbackTransaction();
 			return null;
@@ -1289,7 +1289,7 @@ class Postgres extends ADODB_base {
 		}
 
 		// Triggers
-		$triggers = &$this->getTriggers($table);
+		$triggers = $this->getTriggers($table);
 		if (!is_object($triggers)) {
 			$this->rollbackTransaction();
 			return null;
@@ -1311,7 +1311,7 @@ class Postgres extends ADODB_base {
 		}
 
 		// Rules
-		$rules = &$this->getRules($table);
+		$rules = $this->getRules($table);
 		if (!is_object($rules)) {
 			$this->rollbackTransaction();
 			return null;
@@ -1868,7 +1868,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']];
 
@@ -2540,7 +2540,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']} (";
@@ -3250,7 +3250,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;
@@ -3602,7 +3602,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 ad03ae5e..bba56e38 100644
--- 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.73 2005/09/07 08:09:21 chriskl Exp $
+ * $Id: Postgres71.php,v 1.74 2005/10/18 03:45:16 chriskl Exp $
  */
 
 // @@@ THOUGHT: What about inherits? ie. use of ONLY???
@@ -195,7 +195,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 0dcdd954..fc2296bc 100644
--- a/constraints.php
+++ b/constraints.php
@@ -3,7 +3,7 @@
 	/**
 	 * List constraints on a table
 	 *
-	 * $Id: constraints.php,v 1.41 2005/05/02 15:47:23 chriskl Exp $
+	 * $Id: constraints.php,v 1.42 2005/10/18 03:45:15 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 316bcb1a..d087f58e 100644
--- a/conversions.php
+++ b/conversions.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage conversions in a database
 	 *
-	 * $Id: conversions.php,v 1.10 2005/05/02 15:47:23 chriskl Exp $
+	 * $Id: conversions.php,v 1.11 2005/10/18 03:45:15 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(
@@ -61,7 +61,7 @@
 	function doTree() {
 		global $misc, $data;
 		
-		$conversions = &$data->getconversions();
+		$conversions = $data->getconversions();
 		
 		$attrs = array(
 			'text'   => field('conname'),
diff --git a/database.php b/database.php
index 038430cd..42472265 100755
--- a/database.php
+++ b/database.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage schemas within a database
 	 *
-	 * $Id: database.php,v 1.75 2005/08/11 23:01:44 soranzo Exp $
+	 * $Id: database.php,v 1.76 2005/10/18 03:45:15 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');
diff --git a/dataexport.php b/dataexport.php
index 7f349871..5089519e 100644
--- 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.21 2005/07/15 08:03:12 chriskl Exp $
+	 * $Id: dataexport.php,v 1.22 2005/10/18 03:45:16 chriskl Exp $
 	 */
 
 	$extensions = array(
@@ -113,7 +113,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 8c566250..89d91817 100644
--- 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.51 2005/10/10 21:33:18 xzilla Exp $
+	 * $Id: display.php,v 1.52 2005/10/18 03:45:16 chriskl Exp $
 	 */
 
 	// Prevent timeouts on large exports (non-safe mode only)
@@ -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 aa1d33a5..c5a47d44 100644
--- a/domains.php
+++ b/domains.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage domains in a database
 	 *
-	 * $Id: domains.php,v 1.20 2005/05/02 15:47:23 chriskl Exp $
+	 * $Id: domains.php,v 1.21 2005/10/18 03:45:16 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(
@@ -431,7 +431,7 @@
 	function doTree() {
 		global $misc, $data, $PHP_SELF;
 		
-		$domains = &$data->getDomains();
+		$domains = $data->getDomains();
 		
 		$reqvars = $misc->getRequestVars('domain');
 		
diff --git a/functions.php b/functions.php
index 938fcc4f..5b90ba40 100644
--- a/functions.php
+++ b/functions.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage functions in a database
 	 *
-	 * $Id: functions.php,v 1.51 2005/10/17 08:26:38 jollytoad Exp $
+	 * $Id: functions.php,v 1.52 2005/10/18 03:45:16 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']);
@@ -178,7 +178,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
@@ -236,7 +236,7 @@
 					$tag = 'prenoescape';
 				}
 				else {
-					$temp = &$funcdata->f['prosrc'];
+					$temp = $funcdata->f['prosrc'];
 					$tag = 'pre';
 				}
 				echo "<tr><td class=\"data1\" colspan=\"4\">", $misc->printVal($temp, $tag, array('lineno' => true, 'class' => 'data1')), "</td></tr>\n";
@@ -320,8 +320,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) {
@@ -473,7 +473,7 @@
 		$misc->printTabs('schema','functions');
 		$misc->printMsg($msg);
 		
-		$funcs = &$data->getFunctions();
+		$funcs = $data->getFunctions();
 		
 		$columns = array(
 			'function' => array(
@@ -543,7 +543,7 @@
 	function doTree() {
 		global $misc, $data;
 		
-		$funcs = &$data->getFunctions();
+		$funcs = $data->getFunctions();
 		
 		$proto = concat(field('proname'),' (',field('proarguments'),')');
 		
diff --git a/groups.php b/groups.php
index 870c5914..0a97cf56 100644
--- a/groups.php
+++ b/groups.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage groups in a database cluster
 	 *
-	 * $Id: groups.php,v 1.20 2005/05/02 15:47:23 chriskl Exp $
+	 * $Id: groups.php,v 1.21 2005/10/18 03:45:16 chriskl Exp $
 	 */
 
 	// Include application functions
@@ -71,8 +71,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";
@@ -150,7 +150,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');
@@ -214,7 +214,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 3b8d2921..e88cc918 100644
--- 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.2 2005/10/18 03:45:16 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 d7156649..acb881b1 100644
--- a/indexes.php
+++ b/indexes.php
@@ -3,7 +3,7 @@
 	/**
 	 * List indexes on a table
 	 *
-	 * $Id: indexes.php,v 1.36 2005/08/11 23:01:44 soranzo Exp $
+	 * $Id: indexes.php,v 1.37 2005/10/18 03:45:16 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 d218f846..ff5f8aad 100644
--- a/info.php
+++ b/info.php
@@ -3,7 +3,7 @@
 	/**
 	 * List extra information on a table
 	 *
-	 * $Id: info.php,v 1.10 2005/06/01 10:38:14 soranzo Exp $
+	 * $Id: info.php,v 1.11 2005/10/18 03:45:16 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 29a46791..03f89a27 100644
--- a/languages.php
+++ b/languages.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage languages in a database
 	 *
-	 * $Id: languages.php,v 1.8 2005/06/29 05:11:44 chriskl Exp $
+	 * $Id: languages.php,v 1.9 2005/10/18 03:45:16 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(
@@ -53,7 +53,7 @@
 	function doTree() {
 		global $misc, $data;
 		
-		$languages = &$data->getLanguages();
+		$languages = $data->getLanguages();
 		
 		$attrs = array(
 			'text'   => field('lanname'),
diff --git a/libraries/lib.inc.php b/libraries/lib.inc.php
index 3ffb0d6d..4f1c2b96 100644
--- a/libraries/lib.inc.php
+++ b/libraries/lib.inc.php
@@ -3,7 +3,7 @@
 	/**
 	 * Function library read in upon startup
 	 *
-	 * $Id: lib.inc.php,v 1.103 2005/08/02 15:56:30 soranzo Exp $
+	 * $Id: lib.inc.php,v 1.104 2005/10/18 03:45:16 chriskl Exp $
 	 */
 	include_once('decorator.inc.php');
 	include_once('./lang/translations.php');
@@ -172,7 +172,7 @@
 		include_once('./classes/database/Connection.php');
 		
 		// Connect to database and set the global $data variable
-		$data =& $misc->getDatabaseAccessor($_curr_db);
+		$data = $misc->getDatabaseAccessor($_curr_db);
 
 		// If schema is defined and database supports schemas, then set the 
 		// schema explicitly.
diff --git a/opclasses.php b/opclasses.php
index 5db50573..7d207646 100644
--- a/opclasses.php
+++ b/opclasses.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage opclasss in a database
 	 *
-	 * $Id: opclasses.php,v 1.7 2005/05/02 15:47:24 chriskl Exp $
+	 * $Id: opclasses.php,v 1.8 2005/10/18 03:45:16 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(
@@ -60,7 +60,7 @@
 	function doTree() {
 		global $misc, $data;
 		
-		$opclasses = &$data->getOpClasses();
+		$opclasses = $data->getOpClasses();
 		
 		// OpClass prototype: "op_class/access_method"
 		$proto = concat(field('opcname'),'/',field('amname'));
diff --git a/operators.php b/operators.php
index 3b6379f4..91c484ad 100644
--- a/operators.php
+++ b/operators.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage operators in a database
 	 *
-	 * $Id: operators.php,v 1.19 2005/09/03 04:59:59 chriskl Exp $
+	 * $Id: operators.php,v 1.20 2005/10/18 03:45:16 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(
@@ -162,7 +162,7 @@
 	function doTree() {
 		global $misc, $data, $PHP_SELF;
 		
-		$operators = &$data->getOperators();
+		$operators = $data->getOperators();
 		
 		// Operator prototype: "type operator type"
 		$proto = concat(field('oprleftname'), ' ', field('oprname'), ' ', field('oprrightname'));
diff --git a/plugin_slony.php b/plugin_slony.php
index a8af29d7..090f3b19 100755
--- a/plugin_slony.php
+++ b/plugin_slony.php
@@ -3,7 +3,7 @@
 	/**
 	 * Slony database tab plugin
 	 *
-	 * $Id: plugin_slony.php,v 1.3 2005/07/06 14:46:23 chriskl Exp $
+	 * $Id: plugin_slony.php,v 1.4 2005/10/18 03:45:16 chriskl Exp $
 	 */
 
 	// Avoid database connections whenever possible
@@ -123,7 +123,7 @@
 				
 				break;
 			case 'nodes':			
-				$nodes = &$slony->getNodes();
+				$nodes = $slony->getNodes();
 				
 				$attrs = array(
 					'text'   => field('no_comment'),
@@ -204,7 +204,7 @@
 				
 				break;			
 			case 'paths':
-				$tables = &$slony->getPaths($_REQUEST['no_id']);
+				$tables = $slony->getPaths($_REQUEST['no_id']);
 				
 				$attrs = array(
 					'text'   => field('no_comment'),
@@ -219,7 +219,7 @@
 			
 				break;
 			case 'listens':
-				$tables = &$slony->getListens($_REQUEST['no_id']);
+				$tables = $slony->getListens($_REQUEST['no_id']);
 				
 				$attrs = array(
 					'text'   => field('no_comment'),
@@ -234,7 +234,7 @@
 			
 				break;
 			case 'sets':
-				$sets = &$slony->getReplicationSets();
+				$sets = $slony->getReplicationSets();
 			
 				$attrs = array(
 					'text'   => field('set_comment'),
@@ -341,7 +341,7 @@
 				
 				break;
 			case 'sequences':
-				$tables = &$slony->getSequences($_REQUEST['set_id']);
+				$tables = $slony->getSequences($_REQUEST['set_id']);
 				
 				$reqvars = $misc->getRequestVars('sequence');
 
@@ -363,7 +363,7 @@
 			
 				break;
 			case 'tables':
-				$tables = &$slony->getTables($_REQUEST['set_id']);
+				$tables = $slony->getTables($_REQUEST['set_id']);
 				
 				$reqvars = $misc->getRequestVars('table');
 				
@@ -381,7 +381,7 @@
 			
 				break;
 			case 'subscriptions':
-				$tables = &$slony->getSubscribedNodes($_REQUEST['set_id']);
+				$tables = $slony->getSubscribedNodes($_REQUEST['set_id']);
 				
 				$attrs = array(
 					'text'   => field('no_comment'),
@@ -460,7 +460,7 @@
 		$misc->printMsg($msg);
 		
 		// Fetch the cluster information
-		$cluster = &$slony->getCluster();
+		$cluster = $slony->getCluster();
 		
 		if (is_object($cluster) && $cluster->recordCount() > 0) {			
 			echo "<table>\n";
@@ -622,7 +622,7 @@
 		$misc->printMsg($msg);
 		
 		// Fetch the node information
-		$node = &$slony->getNode($_REQUEST['no_id']);		
+		$node = $slony->getNode($_REQUEST['no_id']);		
 		
 		if (is_object($node) && $node->recordCount() > 0) {			
 			// Show comment if any
@@ -776,7 +776,7 @@
 		$misc->printMsg($msg);
 		
 		// Fetch the path information
-		$path = &$slony->getPath($_REQUEST['no_id'], $_REQUEST['path_id']);		
+		$path = $slony->getPath($_REQUEST['no_id'], $_REQUEST['path_id']);		
 		
 		if (is_object($path) && $path->recordCount() > 0) {			
 			// Show comment if any
@@ -812,7 +812,7 @@
 			if (!isset($_POST['pathretry'])) $_POST['pathretry'] = '10';
 	
 			// Fetch all servers
-			$nodes = &$slony->getNodes();
+			$nodes = $slony->getNodes();
 
 			$misc->printTrail('slony_paths');
 			$misc->printTitle($lang['strcreatepath']);
@@ -954,7 +954,7 @@
 		$misc->printMsg($msg);
 		
 		// Fetch the listen information
-		$listen = &$slony->getListen($_REQUEST['no_id'], $_REQUEST['listen_id']);		
+		$listen = $slony->getListen($_REQUEST['no_id'], $_REQUEST['listen_id']);		
 		
 		if (is_object($listen) && $listen->recordCount() > 0) {			
 			// Show comment if any
@@ -989,7 +989,7 @@
 			if (!isset($_POST['listenprovider'])) $_POST['listenprovider'] = '';
 	
 			// Fetch all servers
-			$nodes = &$slony->getNodes();
+			$nodes = $slony->getNodes();
 
 			$misc->printTrail('slony_listens');
 			$misc->printTitle($lang['strcreatelisten']);
@@ -1149,7 +1149,7 @@
 		$misc->printMsg($msg);
 		
 		// Fetch the set information
-		$set = &$slony->getReplicationSet($_REQUEST['set_id']);		
+		$set = $slony->getReplicationSet($_REQUEST['set_id']);		
 		
 		if (is_object($set) && $set->recordCount() > 0) {			
 			// Show comment if any
@@ -1547,7 +1547,7 @@
 				if (!isset($_POST['tab_id'])) $_POST['tab_id'] = '';
 				if (!isset($_POST['comment'])) $_POST['comment'] = '';
 				
-				$tables = &$data->getTables(true);
+				$tables = $data->getTables(true);
 		
 				$misc->printTrail('slony_sets');
 				$misc->printTitle($lang['straddtable']);
@@ -1591,14 +1591,14 @@
 				$_REQUEST['target'] = unserialize($_REQUEST['target']);
 				$data->setSchema($_REQUEST['target']['schemaname']);
 				// Get indexes
-				$indexes = &$data->getIndexes($_REQUEST['target']['tablename'], true);
+				$indexes = $data->getIndexes($_REQUEST['target']['tablename'], true);
 				if ($indexes->recordCount() == 0) {
 					doAddTable(1, $lang['strtableneedsuniquekey']);
 					return;
 				}
 				
 				// Get triggers
-				$triggers = &$data->getTriggers($_REQUEST['target']['tablename']);				
+				$triggers = $data->getTriggers($_REQUEST['target']['tablename']);				
 
 				// If only one index and no triggers then jump to next step
 				if ($indexes->recordCount() == 1 && $triggers->recordCount() == 0) {
@@ -1679,7 +1679,7 @@
 			case 1:
 				if (!isset($_POST['new_set_id'])) $_POST['new_set_id'] = '';
 				
-				$sets = &$slony->getReplicationSets();
+				$sets = $slony->getReplicationSets();
 		
 				$misc->printTrail('slony_sets');
 				$misc->printTitle($lang['strmove']);
@@ -1820,7 +1820,7 @@
 				if (!isset($_POST['seq_id'])) $_POST['seq_id'] = '';
 				if (!isset($_POST['comment'])) $_POST['comment'] = '';
 				
-				$sequences = &$data->getSequences(true);
+				$sequences = $data->getSequences(true);
 		
 				$misc->printTrail('slony_sets');
 				$misc->printTitle($lang['straddsequence']);
@@ -1918,7 +1918,7 @@
 			case 1:
 				if (!isset($_POST['new_set_id'])) $_POST['new_set_id'] = '';
 				
-				$sets = &$slony->getReplicationSets();
+				$sets = $slony->getReplicationSets();
 		
 				$misc->printTrail('slony_sets');
 				$misc->printTitle($lang['strmove']);
@@ -2009,7 +2009,7 @@
 		$misc->printMsg($msg);
 		
 		// Fetch the subscription information
-		$subscription = &$slony->getSubscription($_REQUEST['set_id'], $_REQUEST['no_id']);		
+		$subscription = $slony->getSubscription($_REQUEST['set_id'], $_REQUEST['no_id']);		
 		
 		if (is_object($subscription) && $subscription->recordCount() > 0) {			
 			// Show comment if any
diff --git a/privileges.php b/privileges.php
index 3e3e95c2..f21ae3a5 100644
--- a/privileges.php
+++ b/privileges.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage privileges in a database
 	 *
-	 * $Id: privileges.php,v 1.37 2005/10/11 18:38:56 xzilla Exp $
+	 * $Id: privileges.php,v 1.38 2005/10/18 03:45:16 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 042a2897..8713fb1f 100644
--- a/reports.php
+++ b/reports.php
@@ -3,7 +3,7 @@
 	/**
 	 * List reports in a database
 	 *
-	 * $Id: reports.php,v 1.21 2005/06/01 10:38:14 soranzo Exp $
+	 * $Id: reports.php,v 1.22 2005/10/18 03:45:16 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');
@@ -134,7 +134,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']);
@@ -203,7 +203,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');
@@ -240,7 +240,7 @@
 		$misc->printTabs('server','reports');
 		$misc->printMsg($msg);
 		
-		$reports = &$reportsdb->getReports();
+		$reports = $reportsdb->getReports();
 		
 		$columns = array(
 			'report' => array(
diff --git a/rules.php b/rules.php
index 22147fc3..c69733ec 100644
--- 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.25 2005/10/18 03:45:16 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/schemas.php b/schemas.php
index fbdbaa6a..c404f6c2 100755
--- a/schemas.php
+++ b/schemas.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage schemas in a database
 	 *
-	 * $Id: schemas.php,v 1.2 2005/07/08 08:30:31 jollytoad Exp $
+	 * $Id: schemas.php,v 1.3 2005/10/18 03:45:16 chriskl Exp $
 	 */
 
 	// Include application functions
@@ -26,7 +26,7 @@
 		
 		// Check that the DB actually supports schemas
 		if ($data->hasSchemas()) {
-			$schemas = &$data->getSchemas();
+			$schemas = $data->getSchemas();
 
 			$columns = array(
 				'schema' => array(
@@ -93,7 +93,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');
@@ -160,7 +160,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'];
@@ -240,7 +240,7 @@
 	function doTree() {
 		global $misc, $data, $lang, $PHP_SELF, $slony;
 		
-		$schemas = &$data->getSchemas();
+		$schemas = $data->getSchemas();
 		
 		$reqvars = $misc->getRequestVars('schema');
 		
diff --git a/sequences.php b/sequences.php
index aa40dfa4..62609a65 100644
--- a/sequences.php
+++ b/sequences.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage sequences in a database
 	 *
-	 * $Id: sequences.php,v 1.29 2005/06/16 14:40:11 chriskl Exp $
+	 * $Id: sequences.php,v 1.30 2005/10/18 03:45:16 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(
@@ -74,7 +74,7 @@
 	function doTree() {
 		global $misc, $data;
 		
-		$sequences = &$data->getSequences();
+		$sequences = $data->getSequences();
 		
 		$reqvars = $misc->getRequestVars('sequence');
 		
@@ -107,7 +107,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 6910fd9d..9f58db81 100644
--- a/sqledit.php
+++ b/sqledit.php
@@ -3,7 +3,7 @@
 	/**
 	 * Alternative SQL editing window
 	 *
-	 * $Id: sqledit.php,v 1.28 2005/10/10 21:33:18 xzilla Exp $
+	 * $Id: sqledit.php,v 1.29 2005/10/18 03:45:16 chriskl Exp $
 	 */
 
 	// Include application functions
@@ -50,7 +50,7 @@
 		echo "</select>\n</td><td align=\"right\">\n";
 		
 		// Get the list of all databases
-		$databases = &$data->getDatabases();
+		$databases = $data->getDatabases();
 
 		if ($databases->recordCount() > 0) {
 			// The javascript action on the select box reloads
diff --git a/tables.php b/tables.php
index 4f152204..4ee67518 100644
--- a/tables.php
+++ b/tables.php
@@ -3,7 +3,7 @@
 	/**
 	 * List tables in a database
 	 *
-	 * $Id: tables.php,v 1.73 2005/10/10 21:33:18 xzilla Exp $
+	 * $Id: tables.php,v 1.74 2005/10/18 03:45:16 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');
@@ -231,7 +231,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) {
@@ -341,7 +341,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) {
@@ -547,7 +547,7 @@
 		$misc->printTabs('schema','tables');
 		$misc->printMsg($msg);
 		
-		$tables = &$data->getTables();
+		$tables = $data->getTables();
 		
 		$columns = array(
 			'table' => array(
@@ -627,7 +627,7 @@
 	function doTree() {
 		global $misc, $data;
 		
-		$tables = &$data->getTables();
+		$tables = $data->getTables();
 		
 		$reqvars = $misc->getRequestVars('table');
 		
diff --git a/tablespaces.php b/tablespaces.php
index dc65e003..a386d44d 100755
--- a/tablespaces.php
+++ b/tablespaces.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage tablespaces in a database cluster
 	 *
-	 * $Id: tablespaces.php,v 1.8 2005/06/01 10:38:14 soranzo Exp $
+	 * $Id: tablespaces.php,v 1.9 2005/10/18 03:45:16 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) {
 			
@@ -128,7 +128,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');
@@ -189,7 +189,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 bfd15682..c207c61b 100644
--- a/tblproperties.php
+++ b/tblproperties.php
@@ -3,7 +3,7 @@
 	/**
 	 * List tables in a database
 	 *
-	 * $Id: tblproperties.php,v 1.66 2005/10/10 21:33:18 xzilla Exp $
+	 * $Id: tblproperties.php,v 1.67 2005/10/18 03:45:16 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) {
 			
@@ -240,7 +240,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');
@@ -361,7 +361,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
@@ -398,7 +398,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
@@ -537,9 +537,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 d8fd44c0..1d512a86 100644
--- a/triggers.php
+++ b/triggers.php
@@ -3,7 +3,7 @@
 	/**
 	 * List triggers on a table
 	 *
-	 * $Id: triggers.php,v 1.27 2005/05/03 02:34:29 soranzo Exp $
+	 * $Id: triggers.php,v 1.28 2005/10/18 03:45:16 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;
@@ -182,7 +182,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['formFrequency'], $_POST['formTriggerArgs']);
 			if ($status == 0)
@@ -212,7 +212,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 a0894f94..614c2023 100644
--- a/types.php
+++ b/types.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage types in a database
 	 *
-	 * $Id: types.php,v 1.27 2005/09/03 05:04:59 chriskl Exp $
+	 * $Id: types.php,v 1.28 2005/10/18 03:45:16 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(
@@ -464,7 +464,7 @@
 	function doTree() {
 		global $misc, $data;
 		
-		$types = &$data->getTypes();
+		$types = $data->getTypes();
 		
 		$reqvars = $misc->getRequestVars('type');
 		
diff --git a/users.php b/users.php
index ef8fba9b..c0226fcb 100644
--- a/users.php
+++ b/users.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage users in a database cluster
 	 *
-	 * $Id: users.php,v 1.30 2005/05/02 15:47:25 chriskl Exp $
+	 * $Id: users.php,v 1.31 2005/10/18 03:45:16 chriskl Exp $
 	 */
 
 	// Include application functions
@@ -25,7 +25,7 @@
 		
 		$server_info = $misc->getServerInfo();
 		
-		$userdata = &$data->getUser($server_info['username']);
+		$userdata = $data->getUser($server_info['username']);
 		$_REQUEST['user'] = $server_info['username'];
 		
 		$misc->printTrail('user');
@@ -112,7 +112,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) {
 			$server_info = $misc->getServerInfo();
@@ -283,7 +283,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 609c327e..a4d6dd00 100755
--- a/viewproperties.php
+++ b/viewproperties.php
@@ -3,7 +3,7 @@
 	/**
 	 * List views in a database
 	 *
-	 * $Id: viewproperties.php,v 1.15 2005/10/11 18:38:56 xzilla Exp $
+	 * $Id: viewproperties.php,v 1.16 2005/10/18 03:45:16 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) {
 			
@@ -133,7 +133,7 @@
 		global $PHP_SELF, $lang;
 	
 		// Get view
-		$vdata = &$data->getView($_REQUEST['view']);
+		$vdata = $data->getView($_REQUEST['view']);
 
 		$misc->printTrail('view');
 		$misc->printTabs('view','definition');
@@ -179,7 +179,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'];
@@ -260,9 +260,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 dde9d89c..b05c9f68 100644
--- a/views.php
+++ b/views.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage views in a database
 	 *
-	 * $Id: views.php,v 1.53 2005/05/02 15:47:25 chriskl Exp $
+	 * $Id: views.php,v 1.54 2005/10/18 03:45:16 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(
@@ -589,7 +589,7 @@
 	function doTree() {
 		global $misc, $data;
 		
-		$views = &$data->getViews();
+		$views = $data->getViews();
 		
 		$reqvars = $misc->getRequestVars('view');