[evolvis-commits] r17246: merge bm:taramir51/patches/xhtml-improvements

mirabilos at evolvis.org mirabilos at evolvis.org
Mon May 16 13:35:24 CEST 2011


Author: mirabilos
Date: 2011-05-16 13:35:24 +0200 (Mon, 16 May 2011)
New Revision: 17246

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/docman/include/utils.php
   trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectGroupFactory.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactFactory.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/tracker/Artifacts.class.php
   trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/controllers/FusionForgeOSLCConnector.php
   trunk/gforge_base/evolvisforge-5.1/src/www/export/tracker.php
   trunk/gforge_base/evolvisforge-5.1/src/www/mail/admin/index.php
   trunk/gforge_base/evolvisforge-5.1/src/www/mail/index.php
   trunk/gforge_base/evolvisforge-5.1/src/www/my/dashboard.php
   trunk/gforge_base/evolvisforge-5.1/src/www/tracker/browse.php
Log:
merge bm:taramir51/patches/xhtml-improvements

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/docman/include/utils.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/docman/include/utils.php	2011-05-16 11:35:20 UTC (rev 17245)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/docman/include/utils.php	2011-05-16 11:35:24 UTC (rev 17246)
@@ -71,7 +71,7 @@
 				$idExposeTreeIndex = $idhtml;
 
 			echo "
-				['".'<span class="JSCookTreeFolderClosed"><i><img alt="" src="\' + ctThemeXPBase + \'folder1.gif" /></i></span><span class="JSCookTreeFolderOpen"><i><img alt="" src="\' + ctThemeXPBase + \'folderopen1.gif"></i></span>'."', '".addslashes($dg->getName())."', '?group_id=".$group_id."&view=listfile&dirid=".$dg->getID()."', '', '',";
+				['".'<span class="JSCookTreeFolderClosed"><i><img alt="" src="\' + ctThemeXPBase + \'folder1.gif" /></i></span><span class="JSCookTreeFolderOpen"><i><img alt="" src="\' + ctThemeXPBase + \'folderopen1.gif" /></i></span>'."', '".addslashes($dg->getName())."', '?group_id=".$group_id."&view=listfile&dirid=".$dg->getID()."', '', '',";
 					docman_recursive_display($dg->getID());
 			echo ",
 				],";

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-05-16 11:35:20 UTC (rev 17245)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php	2011-05-16 11:35:24 UTC (rev 17246)
@@ -1841,7 +1841,7 @@
 		//	Delete Mailing List Factory
 		//
 		$mlf = new MailingListFactory($this);
-		$ml_arr =& $mlf->getMailingLists();
+		$ml_arr = $mlf->getMailingLists();
 		foreach ($ml_arr as $i) {
 			if (!is_object($i)) {
 				continue;

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-05-16 11:35:20 UTC (rev 17245)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectGroupFactory.class.php	2011-05-16 11:35:24 UTC (rev 17246)
@@ -91,7 +91,7 @@
 	 *
 	 *	@return	array	The array of ProjectGroups.
 	 */
-	function getProjectGroups() {
+	function &getProjectGroups() {
 		if ($this->projectGroups) {
 			return $this->projectGroups;
 		}

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-05-16 11:35:20 UTC (rev 17245)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactFactory.class.php	2011-05-16 11:35:24 UTC (rev 17246)
@@ -300,7 +300,7 @@
 	 *
 	 *	@return	array	The array of Artifact objects.
 	 */
-	function &getArtifacts() {
+	function getArtifacts() {
 		if (!empty($this->artifacts)) {
 			return $this->artifacts;
 		}

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/tracker/Artifacts.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/tracker/Artifacts.class.php	2011-05-16 11:35:20 UTC (rev 17245)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/tracker/Artifacts.class.php	2011-05-16 11:35:24 UTC (rev 17246)
@@ -85,7 +85,7 @@
 	 *  @param	boolean	Database query offset.
 	 *  @return an array of artifact objects on success / false on failure.
 	 */
-	function &getArtifacts($offset=false) {
+	function getArtifacts($offset=false) {
 		if (!$offset) {
 			$offset = 0;
 		}

Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/controllers/FusionForgeOSLCConnector.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/controllers/FusionForgeOSLCConnector.php	2011-05-16 11:35:20 UTC (rev 17245)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/controllers/FusionForgeOSLCConnector.php	2011-05-16 11:35:24 UTC (rev 17246)
@@ -289,7 +289,7 @@
 		//$af->details =	$query['search'];
 		
 		// query the DB for requested artifacts 
-		$art_arr =& $af->getArtifacts();
+		$art_arr = $af->getArtifacts();
 		
 		if ($art_arr === false) {
 			throw new Exception('Error '. $af->getErrorMessage());
@@ -459,7 +459,7 @@
 			$af->setup(0,'','',0,$set,$_assigned_to,$_status);
 
 			// query the DB for requested artifacts 
-			$art_arr =& $af->getArtifacts();
+			$art_arr = $af->getArtifacts();
 
 			if ($art_arr === false) {
 				throw new Exception('Error '. $af->getErrorMessage());

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/export/tracker.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/export/tracker.php	2011-05-16 11:35:20 UTC (rev 17245)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/export/tracker.php	2011-05-16 11:35:24 UTC (rev 17246)
@@ -93,7 +93,7 @@
 	//
 	// Loop through each artifact object and show the results
 	//
-	if (!$alist =& $artifacts->getArtifacts($offset)) {
+	if (!$alist = $artifacts->getArtifacts($offset)) {
 		displayError($artifacts->getErrorMessage());
 		$errors = true;
 	}

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/mail/admin/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/mail/admin/index.php	2011-05-16 11:35:20 UTC (rev 17245)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/mail/admin/index.php	2011-05-16 11:35:24 UTC (rev 17246)
@@ -149,7 +149,7 @@
 			exit_error($mlFactory->getErrorMessage(),'mail');
 		}
 		
-		$mlArray =& $mlFactory->getMailingLists();
+		$mlArray = $mlFactory->getMailingLists();
 
 		if ($mlFactory->isError()) {
 			echo '<p class="error">'._('Error').' '._('Unable to get the lists') .$mlFactory->getErrorMessage().'</p>';

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/mail/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/mail/index.php	2011-05-16 11:35:20 UTC (rev 17245)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/mail/index.php	2011-05-16 11:35:24 UTC (rev 17246)
@@ -55,7 +55,7 @@
 
 	plugin_hook ("blocks", "mail index");
 
-	$mlArray =& $mlFactory->getMailingLists();
+	$mlArray = $mlFactory->getMailingLists();
 
 	if ($mlFactory->isError()) {
 		echo '<p class="error">'.sprintf(_('Unable to get the list %s : %s'), $group->getPublicName(), $mlFactory->getErrorMessage()) .'</p>';

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/my/dashboard.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/my/dashboard.php	2011-05-16 11:35:20 UTC (rev 17245)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/my/dashboard.php	2011-05-16 11:35:24 UTC (rev 17246)
@@ -105,7 +105,7 @@
         	                        $af = new ArtifactFactory($ath);
                 	                $af->setup(0,"priority","DESC",0,"",0,1,null);
                         	        // get artifacts from object
-                                	$art_arr =& $af->getArtifacts();
+                                	$art_arr = $af->getArtifacts();
 	                                if (count($art_arr) > 0) {
         	                                echo '<tr><td colspan="' . (array_sum($display_col)+1) . '" align="left" style="color: darkred; border-bottom: 1px solid #A0A0C0; border-top: 1px dotted #A0A0C0; background-color: #CACADA;"><strong> · '. 
 							util_make_link ('/tracker/?group_id='.$at->Group->getID().'&atid='.$at->getID(),

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/browse.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/browse.php	2011-05-16 11:35:20 UTC (rev 17245)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/browse.php	2011-05-16 11:35:24 UTC (rev 17246)
@@ -140,7 +140,7 @@
 $_assigned_to=$af->assigned_to;
 $_extra_fields=$af->extra_fields;
 
-$art_arr =& $af->getArtifacts();
+$art_arr = $af->getArtifacts();
 
 if (!$art_arr && $af->isError()) {
 	exit_error($af->getErrorMessage(),'tracker');



More information about the evolvis-commits mailing list