[evolvis-commits] r15421: Mass php warnings fixes

mirabilos at evolvis.org mirabilos at evolvis.org
Tue Mar 1 00:06:31 CET 2011


Author: mirabilos
Date: 2011-03-01 00:06:31 +0100 (Tue, 01 Mar 2011)
New Revision: 15421

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/forum/ForumMessage.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/forum/ForumMessageFactory.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/forum/ForumsForUser.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/include/RBAC.php
   trunk/gforge_base/evolvisforge-5.1/src/common/include/RBACEngine.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/include/escapingUtils.php
   trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectGroup.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectGroupFactory.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectTaskFactory.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactFactory.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactType.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactTypeFactory.class.php
   trunk/gforge_base/evolvisforge-5.1/src/www/activity/index.php
   trunk/gforge_base/evolvisforge-5.1/src/www/forum/message.php
   trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactTypeHtml.class.php
Log:
Mass php warnings fixes

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/forum/ForumMessage.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/forum/ForumMessage.class.php	2011-02-28 23:06:28 UTC (rev 15420)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/forum/ForumMessage.class.php	2011-02-28 23:06:31 UTC (rev 15421)
@@ -390,7 +390,7 @@
 			$this->setError(_('ForumMessage::fetchData() Invalid MessageID').db_error());
 			return false;
 		}
-		$this->data_array =& db_fetch_array($res);
+		$this->data_array = db_fetch_array($res);
 		db_free_result($res);
 		return true;
 	}

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/forum/ForumMessageFactory.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/forum/ForumMessageFactory.class.php	2011-02-28 23:06:28 UTC (rev 15420)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/forum/ForumMessageFactory.class.php	2011-02-28 23:06:31 UTC (rev 15421)
@@ -141,7 +141,7 @@
 	 *
 	 *	@return	array	The nested multi-dimensional associative array.
 	 */
-	function &nestArray(&$row) {
+	function &nestArray($row) {
 		$cnt=count($row);
 		for ($i=0; $i<$cnt; $i++) {
 			if ($row[$i]) {

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/forum/ForumsForUser.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/forum/ForumsForUser.class.php	2011-02-28 23:06:28 UTC (rev 15420)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/forum/ForumsForUser.class.php	2011-02-28 23:06:31 UTC (rev 15421)
@@ -74,7 +74,7 @@
 			$group_id = db_result($result,$i,'group_id');
 			$forum_id = db_result($result,$i,'group_forum_id');
 			$group =& group_get_object($group_id);
-			$forum =& new Forum($group,$forum_id);
+			$forum = new Forum($group,$forum_id);
 			if ($forum->isError()) {
 				$this->setError($forum->getErrorMessage());
 			} else {

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php	2011-02-28 23:06:28 UTC (rev 15420)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php	2011-02-28 23:06:31 UTC (rev 15421)
@@ -132,7 +132,7 @@
 	if (count($fetch) > 0) {
 		$res=db_query_params ('SELECT * FROM groups WHERE group_id = ANY ($1)',
 				      array (db_int_array_to_any_clause ($fetch))) ;
-		while ($arr =& db_fetch_array($res)) {
+		while ($arr = db_fetch_array($res)) {
 			$GROUP_OBJ["_".$arr['group_id']."_"] = new Group($arr['group_id'],$arr);
 			$return[] =& $GROUP_OBJ["_".$arr['group_id']."_"];
 		}

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/RBAC.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/RBAC.php	2011-02-28 23:06:28 UTC (rev 15420)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/RBAC.php	2011-02-28 23:06:31 UTC (rev 15421)
@@ -342,7 +342,7 @@
 			} elseif ($this instanceof RoleLoggedIn) {
 				$res = db_query_params ('SELECT group_id, enable_anonscm FROM groups WHERE is_public=1',
 							array ()) ;
-				while ($arr =& db_fetch_array($res)) {
+				while ($arr = db_fetch_array($res)) {
 					$this->perms_array['project_read'][$arr['group_id']] = 1 ;
 					$this->perms_array['frs'][$arr['group_id']] = 1 ;
 					$this->perms_array['scm'][$arr['group_id']] = $arr['enable_anonscm'] ;
@@ -350,19 +350,19 @@
 
 				$res = db_query_params ('SELECT t.group_artifact_id FROM artifact_group_list t, groups g WHERE t.is_public=1 AND g.is_public=1 AND t.group_id = g.group_id',
 							array ()) ;
-				while ($arr =& db_fetch_array($res)) {
+				while ($arr = db_fetch_array($res)) {
 					$this->perms_array['tracker'][$arr['group_artifact_id']] = 1 ;
 				}
 
 				$res = db_query_params ('SELECT p.group_project_id FROM project_group_list p, groups g WHERE p.is_public=1 AND g.is_public=1 AND p.group_id = g.group_id',
 							array ()) ;
-				while ($arr =& db_fetch_array($res)) {
+				while ($arr = db_fetch_array($res)) {
 					$this->perms_array['pm'][$arr['group_project_id']] = 1 ;
 				}
 
 				$res = db_query_params ('SELECT f.group_forum_id, f.moderation_level FROM forum_group_list f, groups g WHERE f.is_public=1 AND g.is_public=1 AND f.group_id = g.group_id',
 							array ()) ;
-				while ($arr =& db_fetch_array($res)) {
+				while ($arr = db_fetch_array($res)) {
 					if ($arr['moderation_level'] == 0) {
 						$this->perms_array['forum'][$arr['group_forum_id']] = 3 ;
 					} else {
@@ -376,7 +376,7 @@
 				$this->setError('BaseRole::fetchData()::'.db_error());
 				return false;
 			}
-			$this->data_array =& db_fetch_array($res);
+			$this->data_array = db_fetch_array($res);
 
 			// Load pre-PFO RBAC settings...
 			$res = db_query_params ('SELECT * FROM role_setting WHERE role_id=$1',
@@ -386,7 +386,7 @@
 				return false;
 			}
 			$this->setting_array=array();
-			while ($arr =& db_fetch_array($res)) {
+			while ($arr = db_fetch_array($res)) {
 				$this->setting_array[$arr['section_name']][$arr['ref_id']] = $arr['value'];
 			}
 
@@ -451,7 +451,7 @@
 				$res = db_query_params ('SELECT pfo_rbac_permissions_from_old($1,$2,$3)',
 							array ($role_id, $nsec, $nref)) ;
 				if ($res) {
-					$arr =& db_fetch_array($res) ;
+					$arr = db_fetch_array($res) ;
 					$this->perms_array[$nsec][$nref] = $arr[0] ;
 				}
 			}
@@ -1073,7 +1073,7 @@
 		$result = array () ;
 		$res = db_query_params ('SELECT user_id FROM pfo_user_role WHERE role_id=$1',
 					array ($this->getID())) ;
-		while ($arr =& db_fetch_array($res)) {
+		while ($arr = db_fetch_array($res)) {
 			$result[] = user_get_object ($arr['user_id']) ;
 		}
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/RBACEngine.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/RBACEngine.class.php	2011-02-28 23:06:28 UTC (rev 15420)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/RBACEngine.class.php	2011-02-28 23:06:31 UTC (rev 15421)
@@ -311,7 +311,7 @@
 			$this->setError('RBACEngine::getRolesByAllowedAction()::'.db_error());
 			return false;
 		}
-		while ($arr =& db_fetch_array($res)) {
+		while ($arr = db_fetch_array($res)) {
 			$result[] = $arr['role_id'] ;
 		}
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/escapingUtils.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/escapingUtils.php	2011-02-28 23:06:28 UTC (rev 15420)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/escapingUtils.php	2011-02-28 23:06:31 UTC (rev 15421)
@@ -212,7 +212,7 @@
  * @param int $defaultValue an array which is returned if we can't find the key in the array
  * @return string the wanted value
  */
-function _getArrayFromArray(& $array, $key, $defaultValue = array()) {
+function _getArrayFromArray( $array, $key, $defaultValue = array()) {
 	if(isset($array[$key])) {
 		return $array[$key];
 	}

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectGroup.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectGroup.class.php	2011-02-28 23:06:28 UTC (rev 15420)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectGroup.class.php	2011-02-28 23:06:31 UTC (rev 15421)
@@ -45,7 +45,7 @@
 					$PROJECTGROUP_OBJ["_".$group_project_id."_"]=false;
 					return false;
 				}
-				$data =& db_fetch_array($res);
+				$data = db_fetch_array($res);
 			}
 			$Group =& group_get_object($data["group_id"]);
 			$PROJECTGROUP_OBJ["_".$group_project_id."_"]= new ProjectGroup($Group,$group_project_id,$data);
@@ -64,7 +64,7 @@
 	if (!$res || db_numrows($res) < 1) {
 		return false;
 	}
-	$arr =& db_fetch_array ($res);
+	$arr = db_fetch_array ($res);
 	return $arr['group_id'] ;
 }
 
@@ -198,7 +198,7 @@
 			$this->setError('ProjectGroup:: Invalid group_project_id');
 			return false;
 		}
-		$this->data_array =& db_fetch_array($res);
+		$this->data_array = db_fetch_array($res);
 		db_free_result($res);
 		return true;
 	}

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectGroupFactory.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectGroupFactory.class.php	2011-02-28 23:06:28 UTC (rev 15420)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectGroupFactory.class.php	2011-02-28 23:06:31 UTC (rev 15421)
@@ -80,7 +80,7 @@
 		if (!$res) {
 			return $result ;
 		}
-		while ($arr =& db_fetch_array($res)) {
+		while ($arr = db_fetch_array($res)) {
 			$result[] = $arr['group_project_id'] ;
 		}
 		return $result ;

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectTaskFactory.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectTaskFactory.class.php	2011-02-28 23:06:28 UTC (rev 15420)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectTaskFactory.class.php	2011-02-28 23:06:31 UTC (rev 15421)
@@ -193,7 +193,7 @@
 		}
 
 		$this->project_tasks = array();
-		while ($arr =& db_fetch_array($result)) {
+		while ($arr = db_fetch_array($result)) {
 			if ($this->status && ($this->status != 100)) {
 				if ($this->status == 1) {
 					if ($arr['status_id'] != 1 && $arr['status_id'] != 100)

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactFactory.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactFactory.class.php	2011-02-28 23:06:28 UTC (rev 15420)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactFactory.class.php	2011-02-28 23:06:31 UTC (rev 15421)
@@ -425,7 +425,7 @@
 			$this->setError('Database Error: '.db_error());
 			return false;
 		} else {
-			while ($arr =& db_fetch_array($result)) {
+			while ($arr = db_fetch_array($result)) {
 				$this->artifacts[] = new Artifact($this->ArtifactType, $arr);
 			}
 		}

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactType.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactType.class.php	2011-02-28 23:06:28 UTC (rev 15420)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactType.class.php	2011-02-28 23:06:31 UTC (rev 15421)
@@ -46,7 +46,7 @@
 			if (!$res || db_numrows($res) < 1 ){
 				$ARTIFACTTYPE_OBJ["_".$artType_id."_"]=false;
 			} else {
-				$data =& db_fetch_array($res);
+				$data = db_fetch_array($res);
 				$Group =& group_get_object($data["group_id"]);
 				$ARTIFACTTYPE_OBJ["_".$artType_id."_"]= new ArtifactType($Group,$data["group_artifact_id"],$data);
 			}
@@ -65,7 +65,7 @@
 	if (!$res || db_numrows($res) < 1) {
 		return false;
 	}
-	$arr =& db_fetch_array ($res);
+	$arr = db_fetch_array ($res);
 	return $arr['group_id'] ;
 }
 
@@ -284,7 +284,7 @@
 			$this->setError('ArtifactType: Invalid ArtifactTypeID');
 			return false;
 		}
-		$this->data_array =& db_fetch_array($res);
+		$this->data_array = db_fetch_array($res);
 		db_free_result($res);
 		return true;
 	}
@@ -720,7 +720,7 @@
 				ORDER BY element_pos ASC, element_id ASC',
 						 array ($id)) ;
 			$i=0;
-			while($arr =& db_fetch_array($res)) {
+			while($arr = db_fetch_array($res)) {
 				$this->extra_field[$id][$i++] = $arr;
 			}
 //			if (count($this->extra_field[$id]) == 0) {

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactTypeFactory.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactTypeFactory.class.php	2011-02-28 23:06:28 UTC (rev 15420)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactTypeFactory.class.php	2011-02-28 23:06:31 UTC (rev 15421)
@@ -93,7 +93,7 @@
 		if (!$res) {
 			return $result ;
 		}
-		while ($arr =& db_fetch_array($res)) {
+		while ($arr = db_fetch_array($res)) {
 			$result[] = $arr['group_artifact_id'] ;
 		}
 		return $result ;

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/activity/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/activity/index.php	2011-02-28 23:06:28 UTC (rev 15420)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/activity/index.php	2011-02-28 23:06:31 UTC (rev 15421)
@@ -117,7 +117,7 @@
 echo db_error();
 
 $results = array();
-while ($arr =& db_fetch_array($res)) {
+while ($arr = db_fetch_array($res)) {
 	$results[] = $arr;
 }
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/forum/message.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/forum/message.php	2011-02-28 23:06:28 UTC (rev 15420)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/forum/message.php	2011-02-28 23:06:31 UTC (rev 15421)
@@ -146,7 +146,7 @@
 	echo '<br /><br />
 		<h3>'._('Thread View').'</h3>';
 
-	$msg_arr =& $fmf->nestArray($fmf->getThreaded($fm->getThreadID()));
+	$msg_arr = $fmf->nestArray($fmf->getThreaded($fm->getThreadID()));
 	if ($fmf->isError()) {
 		echo $fmf->getErrorMessage();
 	}

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactTypeHtml.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactTypeHtml.class.php	2011-02-28 23:06:28 UTC (rev 15420)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactTypeHtml.class.php	2011-02-28 23:06:31 UTC (rev 15421)
@@ -346,7 +346,7 @@
 	 *	@return	string	HTML template.
 	 */
 	function generateRenderHTML($filter='', $mode) {
-		$efarr =& $this->getExtraFields($filter);
+		$efarr = $this->getExtraFields($filter);
 		//each two columns, we'll reset this and start a new row
 
 		$return = '
@@ -472,7 +472,7 @@
 		if ($text_100 == 'none'){
 			$text_100=_('None');
 		}
-		$arr =& $this->getExtraFieldElements($extra_field_id);
+		$arr = $this->getExtraFieldElements($extra_field_id);
 		for ($i=0; $i<count($arr); $i++) {
 			$keys[$i]=$arr[$i]['element_id'];
 			$vals[$i]=$arr[$i]['element_name'];



More information about the evolvis-commits mailing list