From ea288cb3623d352c1ae72fe5db149d3d7259fa3d Mon Sep 17 00:00:00 2001
From: paul <paul@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Tue, 14 Nov 2006 19:11:09 +0000
Subject: [PATCH] got rid of =& when constructing objects

---
 campcaster/src/modules/storageAdmin/var/backup.php  |  4 ++--
 campcaster/src/modules/storageAdmin/var/import.php  |  2 +-
 campcaster/src/modules/storageAdmin/var/restore.php | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/campcaster/src/modules/storageAdmin/var/backup.php b/campcaster/src/modules/storageAdmin/var/backup.php
index f75997921..ed44c7e40 100644
--- a/campcaster/src/modules/storageAdmin/var/backup.php
+++ b/campcaster/src/modules/storageAdmin/var/backup.php
@@ -17,7 +17,7 @@ require_once "$storageServerPath/var/Prefs.php";
 PEAR::setErrorHandling(PEAR_ERROR_RETURN);
 $dbc = DB::connect($config['dsn'], TRUE);
 $dbc->setFetchMode(DB_FETCHMODE_ASSOC);
-$bs = &new BasicStor($dbc, $config);
+$bs = new BasicStor($dbc, $config);
 
 $stid = $bs->storId;
 #var_dump($stid); exit;
@@ -156,7 +156,7 @@ function admDumpSubjects(&$bs, $ind=''){
 
 function admDumpPrefs(&$bs, $subjid){
     $res ='';
-    $pr =& new Prefs($bs);
+    $pr = new Prefs($bs);
     $prefkeys = $pr->readKeys($subjid);
 #    var_dump($subjid); var_dump($prefkeys); #exit;
     foreach($prefkeys as $i =>$prefk){
diff --git a/campcaster/src/modules/storageAdmin/var/import.php b/campcaster/src/modules/storageAdmin/var/import.php
index db02e68a0..0fd271a4e 100644
--- a/campcaster/src/modules/storageAdmin/var/import.php
+++ b/campcaster/src/modules/storageAdmin/var/import.php
@@ -24,7 +24,7 @@ if (PEAR::isError($dbc)) {
 	exit(1);
 }
 $dbc->setFetchMode(DB_FETCHMODE_ASSOC);
-$gb =& new GreenBox($dbc, $config);
+$gb = new GreenBox($dbc, $config);
 
 $testonly = (isset($argv[1]) && $argv[1] == '-t');
 
diff --git a/campcaster/src/modules/storageAdmin/var/restore.php b/campcaster/src/modules/storageAdmin/var/restore.php
index ede7eba16..36332aaab 100644
--- a/campcaster/src/modules/storageAdmin/var/restore.php
+++ b/campcaster/src/modules/storageAdmin/var/restore.php
@@ -84,15 +84,15 @@ function ls_restore_restoreObject($obj, $parid, $reallyInsert=TRUE){
 PEAR::setErrorHandling(PEAR_ERROR_RETURN);
 $dbc = DB::connect($config['dsn'], TRUE);
 $dbc->setFetchMode(DB_FETCHMODE_ASSOC);
-$bs = &new BasicStor($dbc, $config);
-$pr =& new Prefs($bs);
+$bs = new BasicStor($dbc, $config);
+$pr = new Prefs($bs);
 
 $dbxml = file_get_contents($argv[1]);
 $tmpdir = $argv[2];
 
-require_once"$storageServerPath/var/XmlParser.php";
-$parser =& new XmlParser($dbxml);
-if($parser->isError()){
+require_once("$storageServerPath/var/XmlParser.php");
+$parser = new XmlParser($dbxml);
+if ($parser->isError()) {
     return PEAR::raiseError(
         "MetaData::parse: ".$parser->getError()
     );