[Fusionforge-commits] r11437 - in trunk/src/plugins: forumml/www hudson/www mailman/etc/plugins/mailman mailman/include mailman/www mailman/www/admin

Christian Bayle cbayle at libremir.placard.fr.eu.org
Sat Nov 6 22:57:50 CET 2010


Author: cbayle
Date: 2010-11-06 22:57:50 +0100 (Sat, 06 Nov 2010)
New Revision: 11437

Modified:
   trunk/src/plugins/forumml/www/forumml_utils.php
   trunk/src/plugins/forumml/www/message.php
   trunk/src/plugins/hudson/www/test_result_pie_chart.php
   trunk/src/plugins/mailman/etc/plugins/mailman/config.php
   trunk/src/plugins/mailman/include/MailmanList.class.php
   trunk/src/plugins/mailman/www/admin/index.php
   trunk/src/plugins/mailman/www/mailman_utils.php
Log:
remove some GLOBALS


Modified: trunk/src/plugins/forumml/www/forumml_utils.php
===================================================================
--- trunk/src/plugins/forumml/www/forumml_utils.php	2010-11-06 21:52:07 UTC (rev 11436)
+++ trunk/src/plugins/forumml/www/forumml_utils.php	2010-11-06 21:57:50 UTC (rev 11437)
@@ -403,7 +403,7 @@
 		$bodyIsCached = true;
 	}
 
-	if (PEAR::isError($from_info = Mail_RFC822::parseAddressList($msg['sender'], $GLOBALS['sys_default_domain'])) || !isset($from_info[0]) || !$from_info[0]->personal) {
+	if (PEAR::isError($from_info = Mail_RFC822::parseAddressList($msg['sender'], forge_get_config('web_host'))) || !isset($from_info[0]) || !$from_info[0]->personal) {
 		$from_info = $hp->purify($msg['sender'], CODENDI_PURIFIER_CONVERT_HTML);
 	} else {
 		$from_info = '<abbr title="'.  $hp->purify($from_info[0]->mailbox .'@'. $from_info[0]->host, CODENDI_PURIFIER_CONVERT_HTML)  .'">'.  $hp->purify($from_info[0]->personal, CODENDI_PURIFIER_CONVERT_HTML)  .'</abbr>';
@@ -426,7 +426,7 @@
 	// get CC
 	$cc = trim($msg['cc']);
 	if ($cc) {
-		if (PEAR::isError($cc_info = Mail_RFC822::parseAddressList($cc, $GLOBALS['sys_default_domain']))) {
+		if (PEAR::isError($cc_info = Mail_RFC822::parseAddressList($cc, forge_get_config('web_host')))) {
 			$ccs = $hp->purify($cc, CODENDI_PURIFIER_CONVERT_HTML);
 		} else {
 			$ccs = array();
@@ -640,7 +640,7 @@
 
 	// Build mail headers
 	$list = new MailmanList($request->get('group_id') , $request->get('list'));
-	$to = $list->getName()."@".$GLOBALS['sys_lists_host'];
+	$to = $list->getName()."@".forge_get_config('lists_host');
 	$mail->setTo($to);
 
 	$mail->setFrom(UserManager::instance()->getCurrentUser()->getEmail());

Modified: trunk/src/plugins/forumml/www/message.php
===================================================================
--- trunk/src/plugins/forumml/www/message.php	2010-11-06 21:52:07 UTC (rev 11436)
+++ trunk/src/plugins/forumml/www/message.php	2010-11-06 21:57:50 UTC (rev 11437)
@@ -174,7 +174,7 @@
 			if ($list->isPublic()==1) {
 				echo ' [<A HREF="'.util_make_url('/pipermail/'.$list->getName()).'/">'._('Original Archives').'</A>]';
 			} else {
-				echo ' ['._('Original list archives').': <A HREF="http://'.$GLOBALS['sys_lists_host'].'/pipermail/'.$list->getName().'/">'._('Public archives').'</A>/<A HREF="http://'.$GLOBALS['sys_lists_host'].'/mailman/private/'.$list->getName().'/">'._('Private Archives').'</A>]';
+				echo ' ['._('Original list archives').': <A HREF="http://'.forge_get_config('lists_host').'/pipermail/'.$list->getName().'/">'._('Public archives').'</A>/<A HREF="http://'.forge_get_config('lists_host').'/mailman/private/'.$list->getName().'/">'._('Private Archives').'</A>]';
 			}
 		}
 		echo "</td>";

Modified: trunk/src/plugins/hudson/www/test_result_pie_chart.php
===================================================================
--- trunk/src/plugins/hudson/www/test_result_pie_chart.php	2010-11-06 21:52:07 UTC (rev 11436)
+++ trunk/src/plugins/hudson/www/test_result_pie_chart.php	2010-11-06 21:57:50 UTC (rev 11437)
@@ -3,8 +3,8 @@
 require_once('pre.php');
 require_once('preplugins.php');
 
-require_once($sys_path_to_jpgraph.'/jpgraph.php');
-require_once($sys_path_to_jpgraph.'/jpgraph_pie.php');
+require_once(forge_get_config('jpgraph_path').'/jpgraph.php');
+require_once(forge_get_config('jpgraph_path').'/jpgraph_pie.php');
 
 $request =& HTTPRequest::instance();
 $pass_count = $request->get('p');

Modified: trunk/src/plugins/mailman/etc/plugins/mailman/config.php
===================================================================
--- trunk/src/plugins/mailman/etc/plugins/mailman/config.php	2010-11-06 21:52:07 UTC (rev 11436)
+++ trunk/src/plugins/mailman/etc/plugins/mailman/config.php	2010-11-06 21:57:50 UTC (rev 11437)
@@ -1,4 +1,4 @@
 <?php 
-$GLOBALS['mailman_bin_dir'] =  $GLOBALS['sys_path_to_mailman'].'/bin';
+$GLOBALS['mailman_bin_dir'] =  forge_get_config('mailman_path').'/bin';
 $GLOBALS['mailman_list_dir'] = '/var/lib/mailman/lists';
 ?>

Modified: trunk/src/plugins/mailman/include/MailmanList.class.php
===================================================================
--- trunk/src/plugins/mailman/include/MailmanList.class.php	2010-11-06 21:52:07 UTC (rev 11436)
+++ trunk/src/plugins/mailman/include/MailmanList.class.php	2010-11-06 21:57:50 UTC (rev 11437)
@@ -145,9 +145,9 @@
 
 		$realListName = strtolower($this->Group->getUnixName().'-'.$listName);
 
-		if(!validate_email($realListName.'@'.$GLOBALS['sys_lists_host'])) {
+		if(!validate_email($realListName.'@'.forge_get_config('lists_host'))) {
 			$this->setError(_('Invalid List Name') . ': ' .
-					$realListName.'@'.$GLOBALS['sys_lists_host']);
+					$realListName.'@'.forge_get_config('lists_host'));
 			return false;
 		}
 		$result=&$this->_mailingDAO->searchByName($realListName);

Modified: trunk/src/plugins/mailman/www/admin/index.php
===================================================================
--- trunk/src/plugins/mailman/www/admin/index.php	2010-11-06 21:52:07 UTC (rev 11436)
+++ trunk/src/plugins/mailman/www/admin/index.php	2010-11-06 21:57:50 UTC (rev 11437)
@@ -116,7 +116,7 @@
 					'title' => _('Add a Mailing List'),
 					'help'=>'CommunicationServices.html#MailingLists',
 					'admin' => '1'));
-		printf(_('<p>Lists are named in this manner:<br /><strong>projectname-listname@%1$s</strong></p><p>It will take <span class="important">few minutes</span> for your list to be created.</p>'), $GLOBALS['sys_lists_host']);
+		printf(_('<p>Lists are named in this manner:<br /><strong>projectname-listname@%1$s</strong></p><p>It will take <span class="important">few minutes</span> for your list to be created.</p>'), forge_get_config('lists_host'));
 
 		$mlFactory = new MailmanListFactory($Group);
 		if (!$mlFactory || !is_object($mlFactory) || $mlFactory->isError()) {
@@ -140,7 +140,7 @@
 			<input type="hidden" name="post_changes" value="y" />
 			<input type="hidden" name="add_list" value="y" />
 			<p><strong><?php echo _('Mailing List Name:'); ?></strong><br />
-			<strong><?php echo $Group->getUnixName(); ?>-<input type="text" name="list_name" value="" size="10" maxlength="12" />@<?php echo $GLOBALS['sys_lists_host']; ?></strong><br /></p>
+			<strong><?php echo $Group->getUnixName(); ?>-<input type="text" name="list_name" value="" size="10" maxlength="12" />@<?php forge_get_config('lists_host'); ?></strong><br /></p>
 			<p>
 			<strong><?php echo _('Is Public?'); ?></strong><br />
 			<input type="radio" name="is_public" value="1" checked="checked" /> <?php echo _('Yes'); ?><br />
@@ -208,7 +208,7 @@
 			mail_footer(array());
 			exit;
 		}
-		echo '<p>'.sprintf(_('You can administrate lists from here. Please note that private lists can still be viewed by members of your project, but are not listed on %1$s.'), $GLOBALS['sys_name']).'</p>';
+		echo '<p>'.sprintf(_('You can administrate lists from here. Please note that private lists can still be viewed by members of your project, but are not listed on %1$s.'), forge_get_config ('forge_name')).'</p>';
 		echo '<ul>
 			<li>
 			<a href="'.$PHP_SELF.'?group_id='.$group_id.'&amp;add_list=1">'._('Add Mailing List').'</a>

Modified: trunk/src/plugins/mailman/www/mailman_utils.php
===================================================================
--- trunk/src/plugins/mailman/www/mailman_utils.php	2010-11-06 21:52:07 UTC (rev 11436)
+++ trunk/src/plugins/mailman/www/mailman_utils.php	2010-11-06 21:57:50 UTC (rev 11437)
@@ -34,8 +34,8 @@
 Thank you for registering your project with %1$s.
 
 -- the %1$s staff
-'), $GLOBALS['sys_name'], $GLOBALS['sys_lists_host'], $list->getName(), $list->getExternalInfoUrl(), util_make_url('/mailman/admin/'.$list->getName()), $list->getPassword());
-       $mailSubject = sprintf(_('%1$s New Mailing List'), $GLOBALS['sys_name']);
+'), forge_get_config ('forge_name'), forge_get_config('lists_host'), $list->getName(), $list->getExternalInfoUrl(), util_make_url('/mailman/admin/'.$list->getName()), $list->getPassword());
+       $mailSubject = sprintf(_('%1$s New Mailing List'), forge_get_config ('forge_name'));
 
 
 




More information about the Fusionforge-commits mailing list