[evolvis-commits] r12374: Migration to util_make_url/link: plugins/*

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Feb 28 01:36:15 CET 2011


Author: mirabilos
Date: 2011-02-28 01:36:15 +0100 (Mon, 28 Feb 2011)
New Revision: 12374

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog
   trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/send_pending_items_mail.php
   trunk/gforge_base/evolvisforge-5.1/gforge/plugins/cvstracker/bin/post.php
   trunk/gforge_base/evolvisforge-5.1/gforge/plugins/cvstracker/common/cvstrackerPlugin.class.php
   trunk/gforge_base/evolvisforge-5.1/gforge/plugins/fckeditor/common/fckeditorPlugin.class.php
   trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/bin/aclcheck.php
   trunk/gforge_base/evolvisforge-5.1/gforge/plugins/svntracker/bin/post.php
   trunk/gforge_base/evolvisforge-5.1/gforge/plugins/svntracker/common/svntrackerPlugin.class.php
Log:
Migration to util_make_url/link: plugins/*

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog	2011-02-28 00:36:13 UTC (rev 12373)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog	2011-02-28 00:36:15 UTC (rev 12374)
@@ -1,3 +1,7 @@
+2008-02-28  Roland Mas  <lolando at debian.org>
+
+	* plugins/*: Migrate to util_make_url() and util_make_link().
+
 2008-02-27  Roland Mas  <lolando at debian.org>
 
 	* deb-specific/db-upgrade.pl: Fixed syntax for PostgreSQL 8.3's

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/send_pending_items_mail.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/send_pending_items_mail.php	2011-02-28 00:36:13 UTC (rev 12373)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/send_pending_items_mail.php	2011-02-28 00:36:15 UTC (rev 12374)
@@ -58,7 +58,6 @@
 	/* first we check the tasks from the project_manager */
 	$sql='select project_task.project_task_id, project_task.group_project_id, project_group_list.group_project_id, group_id, project_task.summary,project_task.created_by, project_task.status_id, project_task_vw.user_name, project_task_vw.status_name, project_task_vw.percent_complete from project_task, project_group_list natural join project_task_vw where project_task.end_date >0 and project_task.end_date<'.$time.' and project_task.group_project_id=project_group_list.group_project_id and project_task.status_id=1;';
 	$res = db_query($sql);
-	global $sys_default_domain;
 	for($i = 0; $i < db_numrows($res); $i++) {
 		$summary= db_result($res,$i,'summary');
 		$status_name=db_result($res,$i,'status_name');
@@ -90,7 +89,6 @@
 
 
 function send_pending_tracker_items_mail(){
-	global $sys_default_domain;
 	/* first, get all the items that are considered overdue */
 	$time = time();
 	$sql = 	'SELECT artifact_id, submitted_by, group_id, assigned_to, summary,  details, description,  assigned_realname, submitted_realname, status_name, category_name, group_name, group_artifact_id, open_date	FROM artifact_vw a NATURAL JOIN artifact_group_list agl	WHERE (agl.due_period+a.open_date) < '.$time.' AND	a.status_id=1';	

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/cvstracker/bin/post.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/cvstracker/bin/post.php	2011-02-28 00:36:13 UTC (rev 12373)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/cvstracker/bin/post.php	2011-02-28 00:36:15 UTC (rev 12374)
@@ -173,7 +173,7 @@
 	$http = "http://";
 }
 
-$SubmitUrl = $http . $sys_default_domain . '/plugins/cvstracker/newcommit.php';
+$SubmitUrl = util_make_url('/plugins/cvstracker/newcommit.php');
 
 $UserArray=posix_getpwuid ( posix_geteuid ( ) );
 $UserName= $UserArray['name'];

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/cvstracker/common/cvstrackerPlugin.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/cvstracker/common/cvstrackerPlugin.class.php	2011-02-28 00:36:13 UTC (rev 12373)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/cvstracker/common/cvstrackerPlugin.class.php	2011-02-28 00:36:15 UTC (rev 12374)
@@ -118,9 +118,9 @@
 	*
 	*/
 	function getFileLink($GroupName, $FileName, $LatestRevision) {
-		global $sys_default_domain;
-		return '<a href="/scm/viewvc.php/'.
-			$FileName.'?root='.$GroupName.'&view=log">'.$FileName.'</a>';
+		return url_make_link ('/scm/viewvc.php/'.$FileName .
+				      '?root='.$GroupName.'&view=log',
+				      $FileName);
 	}
 
 	/**
@@ -134,10 +134,10 @@
 	*
 	*/
 	function getActualVersionLink($GroupName, $FileName, $Version) {
-		global $sys_default_domain;
-		return '<a href="/scm/viewvc.php/'.
-			$FileName.'?root='.$GroupName.'&pathrev='.$Version.'&view=markup">'.
-			$Version.'</a>';
+		return url_make_link ('/scm/viewvc.php/'.$FileName .
+				      '?root='.$GroupName.'&pathrev='.$Version .
+				      '&view=markup',
+				      $Version);
 	}
 
 	/**
@@ -152,11 +152,10 @@
 	*
 	*/
 	function getDiffLink($GroupName, $FileName, $PrevVersion, $ActualVersion) {
-		global $sys_default_domain;
-		return '<a href="/scm/viewvc.php/'.
-			$FileName.'?root='.$GroupName.'&r1='.$PrevVersion.'&r2='.
-			$ActualVersion.'">'.
-			_('Diff To').' '.$PrevVersion.'</a>';
+		return url_make_link ('/scm/viewvc.php/'.$FileName .
+				      '?root='.$GroupName.'&r1='.$PrevVersion .
+				      '&r2='.$ActualVersion,
+				      _('Diff To').' '.$PrevVersion);
 	}
 
 

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/fckeditor/common/fckeditorPlugin.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/fckeditor/common/fckeditorPlugin.class.php	2011-02-28 00:36:13 UTC (rev 12373)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/fckeditor/common/fckeditorPlugin.class.php	2011-02-28 00:36:15 UTC (rev 12374)
@@ -46,7 +46,7 @@
 	*
 	*/
 	function CallHook ($hookname, $params) {
-		global $group_id, $sys_default_domain ;
+		global $group_id;
 
 		if (file_exists ("/usr/share/fckeditor/fckeditor.php")) {
 			$use_system_fckeditor = true ;
@@ -97,10 +97,10 @@
 					$oFCKeditor = new FCKeditor('body') ;
 				}
 				if ($use_system_fckeditor) {
-					$oFCKeditor->BasePath = $http . $sys_default_domain  . '/fckeditor/';
+					$oFCKeditor->BasePath = util_make_url ('/fckeditor/');
 					$oFCKeditor->Config['CustomConfigurationsPath'] = "/plugins/fckeditor/config.js"  ;
 				} else {
-					$oFCKeditor->BasePath = $http . $sys_default_domain  . '/plugins/' . $this->name . '/';
+					$oFCKeditor->BasePath = util_make_url('/plugins/' . $this->name . '/');
 				}
 				$oFCKeditor->Value = $params['body']; // this is the initial text that will be displayed (if any)
 				$oFCKeditor->Width = $params['width'];

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/bin/aclcheck.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/bin/aclcheck.php	2011-02-28 00:36:13 UTC (rev 12373)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/bin/aclcheck.php	2011-02-28 00:36:15 UTC (rev 12374)
@@ -53,7 +53,7 @@
 // Our POSTer in Gforge
 $snoopy = new Snoopy;
 
-$SubmitUrl='http'.(($use_ssl) ? 's' : '' ).'://'.$sys_default_domain.'/plugins/scmcvs/acl.php';
+$SubmitUrl=util_make_url('/plugins/scmcvs/acl.php');
 $SubmitVars['group'] = $projectName;
 $SubmitVars['user'] = $userName;
 

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/svntracker/bin/post.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/svntracker/bin/post.php	2011-02-28 00:36:13 UTC (rev 12373)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/svntracker/bin/post.php	2011-02-28 00:36:15 UTC (rev 12374)
@@ -174,7 +174,7 @@
 	$http = "http://";
 }
 
-$SubmitUrl = $http . $sys_default_domain.'/plugins/svntracker/newcommit.php';
+$SubmitUrl = util_make_url('/plugins/svntracker/newcommit.php');
 if ($svn_tracker_debug) {
 	fwrite($file,"submiturl : " . $SubmitUrl . "\n");
 }

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/svntracker/common/svntrackerPlugin.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/svntracker/common/svntrackerPlugin.class.php	2011-02-28 00:36:13 UTC (rev 12373)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/svntracker/common/svntrackerPlugin.class.php	2011-02-28 00:36:15 UTC (rev 12374)
@@ -111,9 +111,10 @@
 	*
 	*/
 	function getFileLink($GroupName, $FileName, $LatestRevision) {
-		global $sys_default_domain;
-		return '<a href="/plugins/scmsvn/viewcvs.php/'.
-			$FileName.'?root='.$GroupName.'&view=log&rev=' . $LatestRevision .'">'.$FileName.'</a>';
+		return util_make_link ('/plugins/scmsvn/viewcvs.php/'.$FileName .
+				       '?root='.$GroupName.'&view=log&rev=' .
+				       $LatestRevision,
+				       $FileName) ;
 	}
 
 	/**
@@ -127,10 +128,9 @@
 	*
 	*/
 	function getActualVersionLink($GroupName, $FileName, $Version) {
-		global $sys_default_domain;
-		return '<a href="/plugins/scmsvn/viewcvs.php/'.
-			$FileName.'?root='.$GroupName.'&rev='.$Version.'">'.
-			$Version.'</a>';
+		return util_make_link ('/plugins/scmsvn/viewcvs.php/'.$FileName .
+				       '?root='.$GroupName.'&rev='.$Version,
+				       $Version);
 	}
 
 	/**
@@ -145,11 +145,10 @@
 	*
 	*/
 	function getDiffLink($GroupName, $FileName, $PrevVersion, $ActualVersion) {
-		global $sys_default_domain;
-		return '<a href="/plugins/scmsvn/viewcvs.php/'.
-			$FileName.'?root='.$GroupName.'&r1='.$PrevVersion.'&r2='.
-			$ActualVersion.'">'.
-			_('Diff To').' '.$PrevVersion.'</a>';
+		return util_make_link ('/plugins/scmsvn/viewcvs.php/'.$FileName .
+				       '?root='.$GroupName.'&r1='.$PrevVersion .
+				       '&r2='.$ActualVersion,
+				       _('Diff To').' '.$PrevVersion);
 	}
 
 



More information about the evolvis-commits mailing list