[Fusionforge-commits] r9060 - in trunk: gforge/common/forum gforge/common/frs gforge/common/include gforge/common/mail gforge/common/reporting gforge/cronjobs gforge/db gforge/plugins/mediawiki/www gforge/plugins/scmcvs/cronjobs gforge/www gforge/www/account gforge/www/admin gforge/www/export gforge/www/help gforge/www/include gforge/www/mail/admin gforge/www/my gforge/www/news gforge/www/news/admin gforge/www/people gforge/www/project/admin gforge/www/register gforge/www/reporting gforge/www/scm/reporting gforge/www/stats gforge/www/survey gforge/www/themes/gforge-simple-theme gforge/www/themes/osx gforge/www/themes/ultralite gforge/www/top tools

Roland Mas lolando at libremir.placard.fr.eu.org
Mon Mar 15 14:02:41 CET 2010


Author: lolando
Date: 2010-03-15 14:02:41 +0100 (Mon, 15 Mar 2010)
New Revision: 9060

Modified:
   trunk/gforge/common/forum/ForumMessage.class.php
   trunk/gforge/common/frs/FRSRelease.class.php
   trunk/gforge/common/include/Group.class.php
   trunk/gforge/common/include/Navigation.class.php
   trunk/gforge/common/include/User.class.php
   trunk/gforge/common/include/config.php
   trunk/gforge/common/mail/MailingList.class.php
   trunk/gforge/common/reporting/report_utils.php
   trunk/gforge/cronjobs/massmail.php
   trunk/gforge/db/startpoint.php
   trunk/gforge/plugins/mediawiki/www/LocalSettings.php
   trunk/gforge/plugins/scmcvs/cronjobs/usergroup.php
   trunk/gforge/www/account/change_email.php
   trunk/gforge/www/account/change_pw.php
   trunk/gforge/www/account/first.php
   trunk/gforge/www/account/login.php
   trunk/gforge/www/account/lostpw.php
   trunk/gforge/www/account/register.php
   trunk/gforge/www/account/unsubscribe.php
   trunk/gforge/www/admin/index.php
   trunk/gforge/www/admin/unsubscribe.php
   trunk/gforge/www/export/index.php
   trunk/gforge/www/export/rss20_activity.php
   trunk/gforge/www/export/rss20_newreleases.php
   trunk/gforge/www/export/rss20_news.php
   trunk/gforge/www/export/rss20_projects.php
   trunk/gforge/www/export/rss20_version.php
   trunk/gforge/www/export/rss_project.php
   trunk/gforge/www/export/rss_sfnewreleases.php
   trunk/gforge/www/export/rss_sfnews.php
   trunk/gforge/www/export/rss_sfprojects.php
   trunk/gforge/www/export/rss_utils.inc
   trunk/gforge/www/export/search_plugin.php
   trunk/gforge/www/help/index.php
   trunk/gforge/www/include/Layout.class.php
   trunk/gforge/www/include/features_boxes.php
   trunk/gforge/www/include/help.php
   trunk/gforge/www/include/pre.php
   trunk/gforge/www/include/project_home.php
   trunk/gforge/www/include/user_home.php
   trunk/gforge/www/mail/admin/index.php
   trunk/gforge/www/my/diary.php
   trunk/gforge/www/news/admin/index.php
   trunk/gforge/www/news/submit.php
   trunk/gforge/www/people/index.php
   trunk/gforge/www/people/people_utils.php
   trunk/gforge/www/project/admin/vhost.php
   trunk/gforge/www/register/projectinfo.php
   trunk/gforge/www/reporting/groupadded_graph.php
   trunk/gforge/www/reporting/groupcum_graph.php
   trunk/gforge/www/reporting/projectact_graph.php
   trunk/gforge/www/reporting/projecttime_graph.php
   trunk/gforge/www/reporting/siteact_graph.php
   trunk/gforge/www/reporting/sitetime_graph.php
   trunk/gforge/www/reporting/sitetimebar_graph.php
   trunk/gforge/www/reporting/toolspie_graph.php
   trunk/gforge/www/reporting/trackerpie_graph.php
   trunk/gforge/www/reporting/useract_graph.php
   trunk/gforge/www/reporting/useradded_graph.php
   trunk/gforge/www/reporting/usercum_graph.php
   trunk/gforge/www/reporting/usertime_graph.php
   trunk/gforge/www/scm/reporting/commits_graph.php
   trunk/gforge/www/scm/reporting/commitstime_graph.php
   trunk/gforge/www/sendmessage.php
   trunk/gforge/www/stats/graphs.php
   trunk/gforge/www/stats/i18n.php
   trunk/gforge/www/stats/index.php
   trunk/gforge/www/stats/projects.php
   trunk/gforge/www/survey/privacy.php
   trunk/gforge/www/survey/survey_resp.php
   trunk/gforge/www/terms.php
   trunk/gforge/www/themes/gforge-simple-theme/Theme.class.php
   trunk/gforge/www/themes/osx/Theme.class.php
   trunk/gforge/www/themes/ultralite/Theme.class.php
   trunk/gforge/www/top/index.php
   trunk/gforge/www/top/toplist.php
   trunk/tools/jpgraph_pietest.php
Log:
Unified config for core/forge_name (PHP parts only so far)

Modified: trunk/gforge/common/forum/ForumMessage.class.php
===================================================================
--- trunk/gforge/common/forum/ForumMessage.class.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/common/forum/ForumMessage.class.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -690,7 +690,7 @@
 				_("You are receiving this email because you elected to monitor this forum.".
 				  "\nTo stop monitoring this forum, login to %s and visit: \n%s\n"),
 				$text,
-				$GLOBALS['sys_name'],
+				fusionforge_get_config ('core', 'forge_name'),
 				util_make_url('/forum/monitor.php?forum_id='.$this->Forum->getID().
 					      '&group_id='.$this->Forum->Group->getID().'&stop=1')
 				);
@@ -853,7 +853,7 @@
 			$body .=
 			"\n\n______________________________________________________________________".
 			"\nYou are receiving this email because you elected to monitor this forum.".
-			"\nTo stop monitoring this forum, login to ".$GLOBALS['sys_name']." and visit: ".
+			"\nTo stop monitoring this forum, login to ".fusionforge_get_config ('core', 'forge_name')." and visit: ".
 				"\n".util_make_url ('/forum/monitor.php?forum_id='.$this->Forum->getID() .'&group_id='.$this->Forum->Group->getID().'&stop=1');
 	
 			$extra_headers = "Return-Path: <noreply@".$GLOBALS['sys_default_domain'].">\n";

Modified: trunk/gforge/common/frs/FRSRelease.class.php
===================================================================
--- trunk/gforge/common/frs/FRSRelease.class.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/common/frs/FRSRelease.class.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -303,7 +303,7 @@
 					      $this->FRSPackage->Group->getUnixName(),
 					      $this->FRSPackage->getName(),
 					      util_make_url ("/frs/?group_id=". $this->FRSPackage->Group->getID() ."&release_id=". $this->getID()),
-					      $GLOBALS['sys_name'],
+					      fusionforge_get_config ('core', 'forge_name'),
 					      util_make_url ("/frs/monitor.php?filemodule_id=".$this->FRSPackage->getID()."&group_id=".$this->FRSPackage->Group->getID()."&stop=1")));
 //		$text = util_line_wrap($text);
 		if (count($arr)) {

Modified: trunk/gforge/common/include/Group.class.php
===================================================================
--- trunk/gforge/common/include/Group.class.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/common/include/Group.class.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -2261,9 +2261,9 @@
 						       $this->getPublicName(), 
 						       $this->getUnixName(), 
 						       util_make_url ('/project/admin/?group_id='.$this->getID()),
-						       $GLOBALS['sys_name']);
+						       fusionforge_get_config ('core', 'forge_name'));
 	
-			util_send_message($row_admins['email'], sprintf(_('%1$s Project Approved'), $GLOBALS['sys_name']), $message);
+			util_send_message($row_admins['email'], sprintf(_('%1$s Project Approved'), fusionforge_get_config ('core', 'forge_name')), $message);
 
 			setup_gettext_from_context();
 		}
@@ -2306,7 +2306,7 @@
 
 Reasons for negative decision:
 
-'), $this->getPublicName(), $this->getUnixName(), $GLOBALS['sys_name']);
+'), $this->getPublicName(), $this->getUnixName(), fusionforge_get_config ('core', 'forge_name'));
 
 			// Check to see if they want to send a custom rejection response
 			if ($response_id == 0) {
@@ -2318,7 +2318,7 @@
 					"response_text");
 			}
 
-			util_send_message($row_admins['email'], sprintf(_('%1$s Project Denied'), $GLOBALS['sys_name']), $response);
+			util_send_message($row_admins['email'], sprintf(_('%1$s Project Denied'), fusionforge_get_config ('core', 'forge_name')), $response);
 			setup_gettext_from_context();
 		}
 
@@ -2373,13 +2373,13 @@
 
 Please visit the following URL to approve or reject this project:
 %4$s'),
-						       $GLOBALS['sys_name'],
+						       fusionforge_get_config ('core', 'forge_name'),
 						       $this->getPublicName(),
 						       util_unconvert_htmlspecialchars($this->getRegistrationPurpose()),
 						       util_make_url ('/admin/approve-pending.php'),
 						       $submitter->getRealName(), 
 						       $submitter->getUnixName());
-			util_send_message($admin_email, sprintf(_('New %1$s Project Submitted'), $GLOBALS['sys_name']), $message);
+			util_send_message($admin_email, sprintf(_('New %1$s Project Submitted'), fusionforge_get_config ('core', 'forge_name')), $message);
 			setup_gettext_from_context();
 		}
 		
@@ -2392,9 +2392,9 @@
 Project Full Name:  %2$s
 Submitted Description: %3$s
 
-The %1$s admin team will now examine your project submission.  You will be notified of their decision.'), $GLOBALS['sys_name'], $this->getPublicName(), util_unconvert_htmlspecialchars($this->getRegistrationPurpose()), $GLOBALS['sys_default_domain']);
+The %1$s admin team will now examine your project submission.  You will be notified of their decision.'), fusionforge_get_config ('core', 'forge_name'), $this->getPublicName(), util_unconvert_htmlspecialchars($this->getRegistrationPurpose()), $GLOBALS['sys_default_domain']);
 				
-		util_send_message($email, sprintf(_('New %1$s Project Submitted'), $GLOBALS['sys_name']), $message);
+		util_send_message($email, sprintf(_('New %1$s Project Submitted'), fusionforge_get_config ('core', 'forge_name')), $message);
 		setup_gettext_from_context();
 		
 		return true;

Modified: trunk/gforge/common/include/Navigation.class.php
===================================================================
--- trunk/gforge/common/include/Navigation.class.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/common/include/Navigation.class.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -93,17 +93,17 @@
                         $res['titles'] = array();
                         $res['urls'] = array();
                         
-                        $res['titles'][] = $GLOBALS['sys_name'].' - Project News Highlights RSS';
+                        $res['titles'][] = fusionforge_get_config ('core', 'forge_name').' - Project News Highlights RSS';
                         $res['urls'][] = util_make_url('/export/rss_sfnews.php'); 
                         
-                        $res['titles'][] = $GLOBALS['sys_name'].' - Project News Highlights RSS 2.0';
+                        $res['titles'][] = fusionforge_get_config ('core', 'forge_name').' - Project News Highlights RSS 2.0';
                         $res['urls'][] = util_make_url('/export/rss20_news.php'); 
                         
-                        $res['titles'][] = $GLOBALS['sys_name'].' - New Projects RSS';
+                        $res['titles'][] = fusionforge_get_config ('core', 'forge_name').' - New Projects RSS';
                         $res['urls'][] = util_make_url('/export/rss_sfprojects.php'); 
                         
                         if (isset($GLOBALS['group_id'])) { 
-                                $res['titles'][] = $GLOBALS['sys_name'] . ' - New Activity RSS';
+                                $res['titles'][] = fusionforge_get_config ('core', 'forge_name') . ' - New Activity RSS';
                                 $res['urls'][] = util_make_url('/export/rss20_activity.php?group_id='.$GLOBALS['group_id']);
                         }
                         return $res;

Modified: trunk/gforge/common/include/User.class.php
===================================================================
--- trunk/gforge/common/include/User.class.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/common/include/User.class.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -428,10 +428,10 @@
 '),
 					       $this->getUnixName(),
 					       util_make_url ('/account/verify.php?confirm_hash=_'.$this->getConfirmHash()),
-					       $GLOBALS['sys_name']));
+					       fusionforge_get_config ('core', 'forge_name')));
 		util_send_message(
 			$this->getEmail(),
-			sprintf(_('%1$s Account Registration'), $GLOBALS['sys_name']),
+			sprintf(_('%1$s Account Registration'), fusionforge_get_config ('core', 'forge_name')),
 			$message
 		);
 	}

Modified: trunk/gforge/common/include/config.php
===================================================================
--- trunk/gforge/common/include/config.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/common/include/config.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -53,7 +53,7 @@
 	global $fusionforge_config ;
 
 	// Initial implementation reuses values from local.inc:
-	$fusionforge_config['core']['forge_name'] = $GLOBALS['sys_name'] ;
+	$fusionforge_config['core']['forge_name'] = fusionforge_get_config ('core', 'forge_name') ;
 	return ;
 
 	// Real implementation should read *.ini files

Modified: trunk/gforge/common/mail/MailingList.class.php
===================================================================
--- trunk/gforge/common/mail/MailingList.class.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/common/mail/MailingList.class.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -193,8 +193,8 @@
 Thank you for registering your project with %1$s.
 
 -- the %1$s staff
-'), $GLOBALS['sys_name'], $GLOBALS['sys_lists_host'], $realListName, $this->getExternalInfoUrl(), $this->getExternalAdminUrl(), $listPassword);
-			$mailSubject = sprintf(_('%1$s New Mailing List'), $GLOBALS['sys_name']);
+'), fusionforge_get_config ('core', 'forge_name'), $GLOBALS['sys_lists_host'], $realListName, $this->getExternalInfoUrl(), $this->getExternalAdminUrl(), $listPassword);
+			$mailSubject = sprintf(_('%1$s New Mailing List'), fusionforge_get_config ('core', 'forge_name'));
 			
 			util_send_message($userEmail, $mailSubject, $mailBody, 'admin@'.$GLOBALS['sys_default_domain']);
 		}

Modified: trunk/gforge/common/reporting/report_utils.php
===================================================================
--- trunk/gforge/common/reporting/report_utils.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/common/reporting/report_utils.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -24,12 +24,12 @@
  */
 
 function report_header($title) {
-	global $HTML,$sys_name;
+	global $HTML ;
 	echo $HTML->header(array('title'=>" "._('Reporting').": " . $title));
 	if (isset($GLOBALS['feedback'])) {
 		echo html_feedback_top($GLOBALS['feedback']);
 	}
-	echo "<h1>".sprintf(_('%1$s Reporting'), $sys_name)."</h1>\n";
+	echo "<h1>".sprintf(_('%1$s Reporting'), fusionforge_get_config ('core', 'forge_name'))."</h1>\n";
 }
 
 function report_footer() {

Modified: trunk/gforge/cronjobs/massmail.php
===================================================================
--- trunk/gforge/cronjobs/massmail.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/cronjobs/massmail.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -85,7 +85,7 @@
 			"$sys_admin_email",
 			"ATT: Problems with massmail cron script",
 			"This is automatically generated message from\n
-the mass mailing cron script of $sys_name\n
+the mass mailing cron script of ".fusionforge_get_config ('core', 'forge_name')."\n
 installation. There was error querying massmail_queue\n
 database table. Please take appropriate actions.\n"
 		);
@@ -190,7 +190,7 @@
 by visiting following link:
 <%3$s>
 '), 
-				  $GLOBALS['sys_name'], 
+				  fusionforge_get_config ('core', 'forge_name'), 
 				  util_make_url('/account/'),
 				  util_make_url('/account/unsubscribe.php?ch=_'.$row['confirm_hash'])) ;
 	} else {

Modified: trunk/gforge/db/startpoint.php
===================================================================
--- trunk/gforge/db/startpoint.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/db/startpoint.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -5,7 +5,7 @@
 require_once $gfwww.'include/squal_pre.php';
 
 if (!$gfconn) {
-	print "$sys_name Could Not Connect to Database: ".db_error();
+	print fusionforge_get_config ('core', 'forge_name')." Could Not Connect to Database: ".db_error();
 	exit;
 }
 

Modified: trunk/gforge/plugins/mediawiki/www/LocalSettings.php
===================================================================
--- trunk/gforge/plugins/mediawiki/www/LocalSettings.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/plugins/mediawiki/www/LocalSettings.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -38,7 +38,7 @@
                 die( "This script must be run from the command line\n" );
         }
 }
-$wgSitename         = "$sys_name Wiki";
+$wgSitename         = fusionforge_get_config ('core', 'forge_name')." Wiki";
 $wgScriptPath       = "/plugins/mediawiki/wiki/$fusionforgeproject" ;
 
 $wgEmergencyContact = "webmaster at fusionforge.org";

Modified: trunk/gforge/plugins/scmcvs/cronjobs/usergroup.php
===================================================================
--- trunk/gforge/plugins/scmcvs/cronjobs/usergroup.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/plugins/scmcvs/cronjobs/usergroup.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -81,7 +81,7 @@
 $unmanaged_lines_group = array();
 
 // user description is something like "MyGForge user"
-$user_description = preg_replace('/[^[:alnum:] _-]/', '', $sys_name);
+$user_description = preg_replace('/[^[:alnum:] _-]/', '', fusionforge_get_config ('core', 'forge_name'));
 $user_description .= " user";
 
 /*

Modified: trunk/gforge/www/account/change_email.php
===================================================================
--- trunk/gforge/www/account/change_email.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/account/change_email.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -64,10 +64,10 @@
 %2$s
 
  -- the %1$s staff'), 
-					 $GLOBALS['sys_name'],
+					 fusionforge_get_config ('core', 'forge_name'),
 					 util_make_url ('/account/change_email-complete.php?ch=_'.$confirm_hash));
 
-	util_send_message($newemail,sprintf(_('%1$s Verification'), $GLOBALS['sys_name']),$message);
+	util_send_message($newemail,sprintf(_('%1$s Verification'), fusionforge_get_config ('core', 'forge_name')),$message);
 
 	site_user_header(array('title'=>_('Email Change Confirmation')));
 

Modified: trunk/gforge/www/account/change_pw.php
===================================================================
--- trunk/gforge/www/account/change_pw.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/account/change_pw.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -82,7 +82,7 @@
 	site_user_header(array('title'=>_('Successfully Changed Password')));
 	?>
 
-	<?php printf(_('<h2>%1$s Password Change Confirmation</h2><p>Congratulations. You have changed your password.</p>'), $GLOBALS['sys_name']); ?>
+	<?php printf(_('<h2>%1$s Password Change Confirmation</h2><p>Congratulations. You have changed your password.</p>'), fusionforge_get_config ('core', 'forge_name')); ?>
 
 	<p>
 		 <?php printf(_('You should now <a href="%1$s">Return to User Prefs</a>.'),

Modified: trunk/gforge/www/account/first.php
===================================================================
--- trunk/gforge/www/account/first.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/account/first.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -26,9 +26,9 @@
 require_once('../env.inc.php');
 require_once $gfwww.'include/pre.php';
 
-site_user_header(array('title'=>sprintf(_('Welcome to %1$s'), $sys_name)));
+site_user_header(array('title'=>sprintf(_('Welcome to %1$s'), fusionforge_get_config ('core', 'forge_name'))));
 
-printf(_('<p>You are now a registered user on %1$s, the online development environment for Open Source projects.</p><p>As a registered user, you can participate fully in the activities on the site. You may now post messages to the project message forums, post bugs for software in %1$s, sign on as a project developer, or even start your own project.</p><p>Enjoy the site, and please provide us with feedback on ways that we can improve %1$s.</p><p>--the %1$s staff.</p>'), $sys_name);
+printf(_('<p>You are now a registered user on %1$s, the online development environment for Open Source projects.</p><p>As a registered user, you can participate fully in the activities on the site. You may now post messages to the project message forums, post bugs for software in %1$s, sign on as a project developer, or even start your own project.</p><p>Enjoy the site, and please provide us with feedback on ways that we can improve %1$s.</p><p>--the %1$s staff.</p>'), fusionforge_get_config ('core', 'forge_name'));
 
 site_user_footer(array());
 

Modified: trunk/gforge/www/account/login.php
===================================================================
--- trunk/gforge/www/account/login.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/account/login.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -106,7 +106,7 @@
 		$feedback = sprintf(_('<p>Your account is currently pending your email confirmation.		Visiting the link sent to you in this email will activate your account.		<p>If you need this email resent, please click below and a confirmation		email will be sent to the email address you provided in registration.		<p><a href="%1$s">[Resend Confirmation Email]</a>		<br><hr>		<p>'), util_make_url ("/account/pending-resend.php?form_user=".htmlspecialchars($form_loginname)));
 	} else {
 		if ($userstatus == "D") {
-			$feedback .= '<br />'.sprintf(_('<p>Your %1$s account has been removed by %1$s staff. This may occur for two reasons, either 1) you requested that your account be removed; or 2) some action has been performed using your account which has been seen as objectionable (i.e. you have breached the terms of service for use of your account) and your account has been revoked for administrative reasons. Should you have questions or concerns regarding this matter, please log a <a href="%2$s">support request</a>.</p><p>Thank you, <br><br>%1$s Staff</p>'), $GLOBALS['sys_name'], util_make_url ("/support/?group_id=1"));
+			$feedback .= '<br />'.sprintf(_('<p>Your %1$s account has been removed by %1$s staff. This may occur for two reasons, either 1) you requested that your account be removed; or 2) some action has been performed using your account which has been seen as objectionable (i.e. you have breached the terms of service for use of your account) and your account has been revoked for administrative reasons. Should you have questions or concerns regarding this matter, please log a <a href="%2$s">support request</a>.</p><p>Thank you, <br><br>%1$s Staff</p>'), fusionforge_get_config ('core', 'forge_name'), util_make_url ("/support/?group_id=1"));
 		}
 	}
 	html_feedback_top($feedback);

Modified: trunk/gforge/www/account/lostpw.php
===================================================================
--- trunk/gforge/www/account/lostpw.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/account/lostpw.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -64,9 +64,9 @@
 <%2$s>
 
  -- the %1$s staff
-'), $GLOBALS['sys_name'], util_make_url ("/account/lostlogin.php?ch=_".$confirm_hash));
+'), fusionforge_get_config ('core', 'forge_name'), util_make_url ("/account/lostlogin.php?ch=_".$confirm_hash));
 
-		util_send_message($u->getEmail(),sprintf(_('%1$s Verification'), $GLOBALS['sys_name']),$message);
+		util_send_message($u->getEmail(),sprintf(_('%1$s Verification'), fusionforge_get_config ('core', 'forge_name')),$message);
 
 		$HTML->header(array('title'=>"Lost Password Confirmation"));
 

Modified: trunk/gforge/www/account/register.php
===================================================================
--- trunk/gforge/www/account/register.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/account/register.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -80,7 +80,7 @@
 		if ($register) {
 			echo $HTML->header(array('title'=>'Register Confirmation'));
 			
-			printf(_('<p>Congratulations. You have registered on %1$s.  <p> You are now being sent a confirmation email to verify your email address. Visiting the link sent to you in this email will activate your account.'), $sys_name);
+			printf(_('<p>Congratulations. You have registered on %1$s.  <p> You are now being sent a confirmation email to verify your email address. Visiting the link sent to you in this email will activate your account.'), fusionforge_get_config ('core', 'forge_name'));
 			echo $HTML->footer(array());
 			exit;
 		} else {

Modified: trunk/gforge/www/account/unsubscribe.php
===================================================================
--- trunk/gforge/www/account/unsubscribe.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/account/unsubscribe.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -64,9 +64,9 @@
 
 
 if ($all) {
-	$what = sprintf(_('You have been unsubscribed from all %1$s mailings and notifications. In case you will want to re-activate your subscriptions in the future, login and visit your Account Maintenance page.'), $GLOBALS['sys_name']);
+	$what = sprintf(_('You have been unsubscribed from all %1$s mailings and notifications. In case you will want to re-activate your subscriptions in the future, login and visit your Account Maintenance page.'), fusionforge_get_config ('core', 'forge_name'));
 } else {
-	$what = sprintf(_('You have been unsubscribed from %1$s site mailings. In case you will want to re-activate your subscriptions in the future, login and visit your Account Maintenance page.'), $GLOBALS['sys_name']);
+	$what = sprintf(_('You have been unsubscribed from %1$s site mailings. In case you will want to re-activate your subscriptions in the future, login and visit your Account Maintenance page.'), fusionforge_get_config ('core', 'forge_name'));
 }
 ?>
 

Modified: trunk/gforge/www/admin/index.php
===================================================================
--- trunk/gforge/www/admin/index.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/admin/index.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -148,8 +148,8 @@
 
 <h2><?php echo _('Site Utilities'); ?></h2>
 <ul>
-	<li><a href="massmail.php"><?php printf(_('Mail Engine for %1$s Subscribers'), $GLOBALS['sys_name']); ?></a></li>
-	<li><a href="unsubscribe.php"><?php echo $GLOBALS['sys_name']; ?> <?php echo _('Site Mailings Maintenance'); ?></a></li>
+	<li><a href="massmail.php"><?php printf(_('Mail Engine for %1$s Subscribers'), fusionforge_get_config ('core', 'forge_name')); ?></a></li>
+	<li><a href="unsubscribe.php"><?php echo fusionforge_get_config ('core', 'forge_name'); ?> <?php echo _('Site Mailings Maintenance'); ?></a></li>
 	<li><a href="edit_frs_filetype.php"><?php echo _('Add, Delete, or Edit File Types'); ?></a></li>
 	<li><a href="edit_frs_processor.php"><?php echo _('Add, Delete, or Edit Processors'); ?></a></li>
 	<li><a href="edit_theme.php"><?php echo _('Add, Delete, or Edit Themes'); ?></a></li>

Modified: trunk/gforge/www/admin/unsubscribe.php
===================================================================
--- trunk/gforge/www/admin/unsubscribe.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/admin/unsubscribe.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -95,7 +95,7 @@
 </h1>
 
 <p>
-<?php printf(_('Use field below to find users which match given pattern with the %1$s username, real name, or email address (substring match is preformed, use \'%%\' in the middle of pattern to specify 0 or more arbitrary characters). Click on the username to unsubscribe user from site mailings (new form will appear).'), $GLOBALS['sys_name']); ?>
+<?php printf(_('Use field below to find users which match given pattern with the %1$s username, real name, or email address (substring match is preformed, use \'%%\' in the middle of pattern to specify 0 or more arbitrary characters). Click on the username to unsubscribe user from site mailings (new form will appear).'), fusionforge_get_config ('core', 'forge_name')); ?>
 </p>
 
 <form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="post">

Modified: trunk/gforge/www/export/index.php
===================================================================
--- trunk/gforge/www/export/index.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/export/index.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -15,7 +15,7 @@
 
 $HTML->header(array(title=>_('Exports Available')));
 ?>
-<p><?php echo $GLOBALS['sys_name']; ?> data is exported in a variety of standard formats. Many of
+<p><?php echo fusionforge_get_config ('core', 'forge_name'); ?> data is exported in a variety of standard formats. Many of
 the export URLs can also accept form/get data to customize the output. All
 data generated by these pages is realtime.</p>
 
@@ -25,35 +25,35 @@
 
 <h4>News Data</h4>
 <ul>
-<li><a href="rss_sfnews.php"><?php echo $GLOBALS['sys_name']; ?> Front Page/Project News</a>
- <link href="rss_sfnews.php" title="<?php echo $GLOBALS['sys_name']; ?> Front Page/Project News, RSS 1.0" rel="alternate" type="application/rss+xml" />
+<li><a href="rss_sfnews.php"><?php echo fusionforge_get_config ('core', 'forge_name'); ?> Front Page/Project News</a>
+ <link href="rss_sfnews.php" title="<?php echo fusionforge_get_config ('core', 'forge_name'); ?> Front Page/Project News, RSS 1.0" rel="alternate" type="application/rss+xml" />
 (<a href="http://web.resource.org/rss/1.0/spec">RSS 1.0</a>)</li>
-<li><a href="rss_sfnewreleases.php"><?php echo $GLOBALS['sys_name']; ?> New Releases</a>
- <link href="rss_sfnewreleases.php" title="<?php echo $GLOBALS['sys_name']; ?> New Releases, RSS 0.91" rel="alternate" type="application/rss+xml" />
+<li><a href="rss_sfnewreleases.php"><?php echo fusionforge_get_config ('core', 'forge_name'); ?> New Releases</a>
+ <link href="rss_sfnewreleases.php" title="<?php echo fusionforge_get_config ('core', 'forge_name'); ?> New Releases, RSS 0.91" rel="alternate" type="application/rss+xml" />
 (<a href="http://my.netscape.com/publish/formats/rss-spec-0.91.html">RSS 0.91</a>,
 <a href="http://my.netscape.com/publish/formats/rss-0.91.dtd">&lt;rss-0.91.dtd&gt;</a>)</li>
 </ul>
 
 <ul>
-<li><a href="rss20_news.php"><?php print $GLOBALS['sys_name'] ?> Front Page News/Project News</a>
- <link href="rss20_news.php" title="<?php print $GLOBALS[sys_name] ?> Front Page News/Project News, RSS 2.0" rel="alternate" type="application/rss+xml" />
+<li><a href="rss20_news.php"><?php print fusionforge_get_config ('core', 'forge_name') ?> Front Page News/Project News</a>
+ <link href="rss20_news.php" title="<?php print fusionforge_get_config ('core', 'forge_name') ?> Front Page News/Project News, RSS 2.0" rel="alternate" type="application/rss+xml" />
 (<a href="http://blogs.law.harvard.edu/tech/rss">RSS 2.0</a>)
-<li><a href="rss20_newreleases.php"><?php print $GLOBALS['sys_name'] ?> New Releases/New Project Releases</a>
- <link href="rss20_newreleases.php" title="<?php print $GLOBALS[sys_name] ?> New Releases/New Project Releases, RSS 2.0" rel="alternate" type="application/rss+xml" />
+<li><a href="rss20_newreleases.php"><?php print fusionforge_get_config ('core', 'forge_name') ?> New Releases/New Project Releases</a>
+ <link href="rss20_newreleases.php" title="<?php print fusionforge_get_config ('core', 'forge_name') ?> New Releases/New Project Releases, RSS 2.0" rel="alternate" type="application/rss+xml" />
 (<a href="http://blogs.law.harvard.edu/tech/rss">RSS 2.0</a>)</li>
 </ul>
 
 <h4>Site Information</h4>
 <ul>
-<li><a href="rss_sfprojects.php"><?php echo $GLOBALS['sys_name']; ?> Full Project Listing</a>
- <link href="rss_sfprojects.php" title="<?php echo $GLOBALS['sys_name']; ?> Full Project Listing, RSS 0.91" rel="alternate" type="application/rss+xml" />
+<li><a href="rss_sfprojects.php"><?php echo fusionforge_get_config ('core', 'forge_name'); ?> Full Project Listing</a>
+ <link href="rss_sfprojects.php" title="<?php echo fusionforge_get_config ('core', 'forge_name'); ?> Full Project Listing, RSS 0.91" rel="alternate" type="application/rss+xml" />
 (<a href="http://my.netscape.com/publish/formats/rss-spec-0.91.html">RSS 0.91</a>,
 <a href="http://my.netscape.com/publish/formats/rss-0.91.dtd">&lt;rss-0.91.dtd&gt;</a>)</li>
-<li><a href="rss20_projects.php"><?php print $GLOBALS['sys_name'] ?> Full Project Listing</a>
- <link href="rss20_projects.php" title="<?php print $GLOBALS[sys_name] ?> Full Project Listing, RSS 2.0" rel="alternate" type="application/rss+xml" />
+<li><a href="rss20_projects.php"><?php print fusionforge_get_config ('core', 'forge_name') ?> Full Project Listing</a>
+ <link href="rss20_projects.php" title="<?php print fusionforge_get_config ('core', 'forge_name') ?> Full Project Listing, RSS 2.0" rel="alternate" type="application/rss+xml" />
 (<a href="http://blogs.law.harvard.edu/tech/rss">RSS 2.0</a>)</li>
-<li><a href="trove_tree.php"><?php echo $GLOBALS['sys_name']; ?> Trove Categories Tree</a>
- <link href="trove_tree.php" title="<?php echo $GLOBALS['sys_name']; ?> Trove Categories Tree, XML" rel="alternate" type="application/x-trove+xml" />
+<li><a href="trove_tree.php"><?php echo fusionforge_get_config ('core', 'forge_name'); ?> Trove Categories Tree</a>
+ <link href="trove_tree.php" title="<?php echo fusionforge_get_config ('core', 'forge_name'); ?> Trove Categories Tree, XML" rel="alternate" type="application/x-trove+xml" />
 (<a href="http://www.w3.org/XML">XML</a>,<a href="trove_tree_0.1.dtd">&lt;trove_tree_0.1.dtd&gt;</a>)</li>
 </ul>
 

Modified: trunk/gforge/www/export/rss20_activity.php
===================================================================
--- trunk/gforge/www/export/rss20_activity.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/export/rss20_activity.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -61,15 +61,15 @@
        <rss version="2.0">
        ';
 	print " <channel>\n";
-	print "  <title>".$GLOBALS['sys_name']." $title Activity</title>\n";
+	print "  <title>".fusionforge_get_config ('core', 'forge_name')." $title Activity</title>\n";
 	print "  <link>$url/activity/$link</link>\n";
-	print "  <description>".$GLOBALS['sys_name']." Project Activity$description</description>\n";
+	print "  <description>".fusionforge_get_config ('core', 'forge_name')." Project Activity$description</description>\n";
 	print "  <language>en-us</language>\n";
-	print "  <copyright>Copyright ".date("Y")." ".$GLOBALS['sys_name']."</copyright>\n";
+	print "  <copyright>Copyright ".date("Y")." ".fusionforge_get_config ('core', 'forge_name')."</copyright>\n";
 	print "  <webMaster>$webmaster</webMaster>\n";
 	print "  <lastBuildDate>".rss_date(time())."</lastBuildDate>\n";
 	print "  <docs>http://blogs.law.harvard.edu/tech/rss</docs>\n";
-	print "  <generator>".$GLOBALS['sys_name']." RSS generator</generator>\n";
+	print "  <generator>".fusionforge_get_config ('core', 'forge_name')." RSS generator</generator>\n";
 
 	$res = db_query_params ('SELECT * FROM activity_vw WHERE activity_date BETWEEN $1 AND $2 AND group_id=$3 ORDER BY activity_date DESC',
 				array(time() - 30*86400,

Modified: trunk/gforge/www/export/rss20_newreleases.php
===================================================================
--- trunk/gforge/www/export/rss20_newreleases.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/export/rss20_newreleases.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -41,11 +41,11 @@
 
 // ## one time output
 print " <channel>\n";
-print "  <title>".$GLOBALS['sys_name']." Project$title Releases</title>\n";
+print "  <title>".fusionforge_get_config ('core', 'forge_name')." Project$title Releases</title>\n";
 print "  <link>http://".$GLOBALS['sys_default_domain']."$link</link>\n";
-print "  <description>".$GLOBALS['sys_name']." Project Releases$description</description>\n";
+print "  <description>".fusionforge_get_config ('core', 'forge_name')." Project Releases$description</description>\n";
 print "  <language>en-us</language>\n";
-print "  <copyright>Copyright ".date("Y")." ".$GLOBALS['sys_name']."</copyright>\n";
+print "  <copyright>Copyright ".date("Y")." ".fusionforge_get_config ('core', 'forge_name')."</copyright>\n";
 print "  <webMaster>$webmaster</webMaster>\n";
 print "  <lastBuildDate>".rss_date(time())."</lastBuildDate>\n";
 print "  <docs>http://blogs.law.harvard.edu/tech/rss</docs>\n";

Modified: trunk/gforge/www/export/rss20_news.php
===================================================================
--- trunk/gforge/www/export/rss20_news.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/export/rss20_news.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -40,20 +40,20 @@
 	$webmaster = $GLOBALS['sys_admin_email'];
 }
 
-$rssTitle = $GLOBALS['sys_name']." Project$title News";
+$rssTitle = fusionforge_get_config ('core', 'forge_name')." Project$title News";
 $rssLink = "http://".$GLOBALS['sys_default_domain']."/news/$link";
 
 // ## one time output
 print " <channel>\n";
 print "  <title>".$rssTitle."</title>\n";
 print "  <link>".$rssLink."</link>\n";
-print "  <description>".$GLOBALS['sys_name']." Project News$description</description>\n";
+print "  <description>".fusionforge_get_config ('core', 'forge_name')." Project News$description</description>\n";
 print "  <language>en-us</language>\n";
-print "  <copyright>Copyright ".date("Y")." ".$GLOBALS['sys_name']."</copyright>\n";
+print "  <copyright>Copyright ".date("Y")." ".fusionforge_get_config ('core', 'forge_name')."</copyright>\n";
 print "  <webMaster>$webmaster</webMaster>\n";
 print "  <lastBuildDate>".rss_date(time())."</lastBuildDate>\n";
 print "  <docs>http://blogs.law.harvard.edu/tech/rss</docs>\n";
-print "  <generator>".$GLOBALS['sys_name']." RSS generator</generator>\n";
+print "  <generator>".fusionforge_get_config ('core', 'forge_name')." RSS generator</generator>\n";
 
 $res = db_query_params ('SELECT forum_id,summary,post_date,details,g.group_id,g.group_name,u.realname,u.user_name
 FROM news_bytes, groups g,users u

Modified: trunk/gforge/www/export/rss20_projects.php
===================================================================
--- trunk/gforge/www/export/rss20_projects.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/export/rss20_projects.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -20,6 +20,6 @@
 
 //rss20_dump_project_result_set($res,$GLOBALS['sys_default_name'].' Full Project Listing');
 // quick and dirty fix
-rss_dump_project_result_set($res,$GLOBALS['sys_name'].' Full Project Listing');
+rss_dump_project_result_set($res,fusionforge_get_config ('core', 'forge_name').' Full Project Listing');
 ?>
 </rss>

Modified: trunk/gforge/www/export/rss20_version.php
===================================================================
--- trunk/gforge/www/export/rss20_version.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/export/rss20_version.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -13,7 +13,7 @@
 $name=$forge->software_name;
 $date=rss_date(time());
 $link="http://".$GLOBALS['sys_default_domain'].'/';
-$title=$GLOBALS['sys_name'].' - Software version';
+$title=fusionforge_get_config ('core', 'forge_name').' - Software version';
 
 header("Content-Type: text/xml; charset=utf-8");
 print '<?xml version="1.0" encoding="UTF-8"?>';

Modified: trunk/gforge/www/export/rss_project.php
===================================================================
--- trunk/gforge/www/export/rss_project.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/export/rss_project.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -78,7 +78,7 @@
  
 printf(_('%1$s data is exported in RSS 2.0 format. Many of
 the export URLs can also accept form/get data to customize the output. All
-data generated by these pages is realtime.'),$GLOBALS['sys_name']);
+data generated by these pages is realtime.'), fusionforge_get_config ('core', 'forge_name'));
 
 echo _('To get Project News or New Project Releases of a specific project use the Links below.'); 
 

Modified: trunk/gforge/www/export/rss_sfnewreleases.php
===================================================================
--- trunk/gforge/www/export/rss_sfnewreleases.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/export/rss_sfnewreleases.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -48,11 +48,11 @@
 
 // ## one time output
 print " <channel>\n";
-print "  <copyright>Copyright ".date("Y")." ".$GLOBALS['sys_name']."</copyright>\n";
+print "  <copyright>Copyright ".date("Y")." ".fusionforge_get_config ('core', 'forge_name')."</copyright>\n";
 print "  <pubDate>".rss_date(time())."</pubDate>\n";
-print "  <description>".$GLOBALS['sys_name']." New Releases</description>\n";
+print "  <description>".fusionforge_get_config ('core', 'forge_name')." New Releases</description>\n";
 print "  <link>http://".$GLOBALS['sys_default_domain']."</link>\n";
-print "  <title>".$GLOBALS['sys_name']." New Releases</title>\n";
+print "  <title>".fusionforge_get_config ('core', 'forge_name')." New Releases</title>\n";
 print "  <webMaster>".$GLOBALS['sys_admin_email']."</webMaster>\n";
 print "  <language>en-us</language>\n";
 // ## item outputs

Modified: trunk/gforge/www/export/rss_sfnews.php
===================================================================
--- trunk/gforge/www/export/rss_sfnews.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/export/rss_sfnews.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -61,9 +61,9 @@
 
 print "\n <channel rdf:about=\"".util_make_url ('/export/rss_sfnews.php')."\">\n";
 
-print "  <title>".$GLOBALS['sys_name']." Project News</title>\n";
+print "  <title>".fusionforge_get_config ('core', 'forge_name')." Project News</title>\n";
 print "  <link>".util_make_url ('/')."</link>\n";
-print "  <description>".$GLOBALS['sys_name']." Project News Highlights</description>\n";
+print "  <description>".fusionforge_get_config ('core', 'forge_name')." Project News Highlights</description>\n";
 // ## item outputs
 print " <items>\n";
 print " <rdf:Seq>\n";

Modified: trunk/gforge/www/export/rss_sfprojects.php
===================================================================
--- trunk/gforge/www/export/rss_sfprojects.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/export/rss_sfprojects.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -36,6 +36,6 @@
 			array('A'),
 			$limit);
 
-rss_dump_project_result_set($res,$GLOBALS['sys_name'].' Full Project Listing');
+rss_dump_project_result_set($res,fusionforge_get_config ('core', 'forge_name').' Full Project Listing');
 ?>
 </rss>

Modified: trunk/gforge/www/export/rss_utils.inc
===================================================================
--- trunk/gforge/www/export/rss_utils.inc	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/export/rss_utils.inc	2010-03-15 13:02:41 UTC (rev 9060)
@@ -44,7 +44,7 @@
         if (!$desription) $desription=$title;
 	// one time output
 	print " <channel>\n";
-	print "  <copyright>Copyright ".date("Y")." ".$GLOBALS['sys_name']."</copyright>\n";
+	print "  <copyright>Copyright ".date("Y")." ".fusionforge_get_config ('core', 'forge_name')."</copyright>\n";
 	print "  <pubDate>".rss_date(time())."</pubDate>\n";
 	print "  <description>$desription</description>\n";
 	print "  <link>http://".$GLOBALS['sys_default_domain']."/</link>\n";

Modified: trunk/gforge/www/export/search_plugin.php
===================================================================
--- trunk/gforge/www/export/search_plugin.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/export/search_plugin.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -14,7 +14,7 @@
 print '<?xml version="1.0" encoding="UTF-8"?>';
 ?>
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-<ShortName><?php echo $GLOBALS['sys_name']; ?></ShortName>
+<ShortName><?php echo fusionforge_get_config ('core', 'forge_name'); ?></ShortName>
 <Description><?php echo _("Search in project"); ?></Description>
 <InputEncoding>UTF-8</InputEncoding>
 <Image width="16" height="16" type="image/x-icon"><?php echo "http://".$GLOBALS['sys_default_domain']."/images/opensearchdescription.png"; ?></Image>

Modified: trunk/gforge/www/help/index.php
===================================================================
--- trunk/gforge/www/help/index.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/help/index.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -26,7 +26,7 @@
 require_once('../env.inc.php');
 require_once $gfwww.'include/pre.php';
 
-$HTML->header(array('title'=>sprintf(_('Welcome to %1$s'), $GLOBALS['sys_name'])));
+$HTML->header(array('title'=>sprintf(_('Welcome to %1$s'), fusionforge_get_config ('core', 'forge_name'))));
 
 print "<p>" ._('Page Information')."</p>";
 /**

Modified: trunk/gforge/www/include/Layout.class.php
===================================================================
--- trunk/gforge/www/include/Layout.class.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/include/Layout.class.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -288,7 +288,7 @@
 	 */
 	function headerSearch() {
 		echo '<link rel="search" title="' 
-			. $GLOBALS['sys_name'].'" href="' 
+			. fusionforge_get_config ('core', 'forge_name').'" href="' 
 			. util_make_url ('/export/search_plugin.php') 
 			. '" type="application/opensearchdescription+xml"/>';
 	}

Modified: trunk/gforge/www/include/features_boxes.php
===================================================================
--- trunk/gforge/www/include/features_boxes.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/include/features_boxes.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -20,9 +20,9 @@
 	if ($sys_use_project_tags) {
 		$return .= $HTML->boxTop(_('Tag Cloud'), 'Tag_Cloud');
 		$return .= tag_cloud();
-		$return .= $HTML->boxMiddle(sprintf(_('%1$s Statistics'), $GLOBALS['sys_name']), 'Forge_Statistics');
+		$return .= $HTML->boxMiddle(sprintf(_('%1$s Statistics'), fusionforge_get_config ('core', 'forge_name')), 'Forge_Statistics');
 	} else {
-		$return .= $HTML->boxTop(sprintf(_('%1$s Statistics'), $GLOBALS['sys_name']), 'Forge_Statistics');
+		$return .= $HTML->boxTop(sprintf(_('%1$s Statistics'), fusionforge_get_config ('core', 'forge_name')), 'Forge_Statistics');
 	}
 	$return .= show_sitestats();
 	if ($sys_use_frs) {

Modified: trunk/gforge/www/include/help.php
===================================================================
--- trunk/gforge/www/include/help.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/include/help.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -37,7 +37,7 @@
 <title><?php print $title; ?></title>
 </head>
 <body>
-<h4><?php echo $GLOBALS['sys_name']; ?> Site Help System:</h4>
+<h4><?php echo fusionforge_get_config ('core', 'forge_name'); ?> Site Help System:</h4>
 <h2><?php print $title; ?></h2>
 <hr />
 <?php

Modified: trunk/gforge/www/include/pre.php
===================================================================
--- trunk/gforge/www/include/pre.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/include/pre.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -99,7 +99,7 @@
 db_connect();
 
 if (!$GLOBALS['gfconn']) {
-	print "$sys_name Could Not Connect to Database: ".db_error();
+	print fusionforge_get_config ('core', 'forge_name')." Could Not Connect to Database: ".db_error();
 	exit;
 }
 

Modified: trunk/gforge/www/include/project_home.php
===================================================================
--- trunk/gforge/www/include/project_home.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/include/project_home.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -43,7 +43,7 @@
 				'A'));
 
 if ($project->getStatus() == 'H') {
-	print "<p>".sprintf(_('NOTE: This project entry is maintained by the %1$s staff. We are not the official site for this product. Additional copyright information may be found on this project\'s homepage.'), $GLOBALS['sys_name'])."</p>\n";
+	print "<p>".sprintf(_('NOTE: This project entry is maintained by the %1$s staff. We are not the official site for this product. Additional copyright information may be found on this project\'s homepage.'), fusionforge_get_config ('core', 'forge_name'))."</p>\n";
 }
 
 $hook_params = array () ;

Modified: trunk/gforge/www/include/user_home.php
===================================================================
--- trunk/gforge/www/include/user_home.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/include/user_home.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -165,9 +165,7 @@
 $me = session_get_user(); 
 if ($sys_use_ratings) {
 if ($user->usesRatings() && (!$me || $me->usesRatings())) { 
-    echo '<p>If you are familiar with this user, please take a moment to rate him/her on the following criteria. Keep in mind, that your rating will be visible to the user and others.</p>';
-    echo '<p>The '. $GLOBALS['sys_name'] .' Peer Rating system is based on concepts from <a href="http://www.advogato.com/">Advogato</a>. The system has been re-implemented and expanded in a few ways.</p>';
-
+	printf(_('<p>If you are familiar with this user, please take a moment to rate him/her on the following criteria. Keep in mind, that your rating will be visible to the user and others.</p><p>The %1$s Peer Rating system is based on concepts from <a href="http://www.advogato.com/">Advogato.</a> The system has been re-implemented and expanded in a few ways.</p>'), fusionforge_get_config ('core', 'forge_name'));
 ?>
 
 	<div class="align-center">
@@ -175,7 +173,7 @@
 	</div>
 
 		  <?php printf(_('<p>The Peer rating box shows all rating averages (and response levels) for each individual criteria. Due to the math and processing required to do otherwise, these numbers incoporate responses from both "trusted" and "non-trusted" users.</p><ul><li>The "Sitewide Rank" field shows the user\'s rank compared to all ranked %1$s users.</li><li>The "Aggregate Score" shows an average, weighted overall score, based on trusted-responses only.</li><li>The "Personal Importance" field shows the weight that users ratings of other developers will be given (between 1 and 1.5) -- higher rated user\'s responses are given more weight.</li></ul><p>If you would like to opt-out from peer rating system (this will affect your ability to both rate and be rated), refer to <a href="%2$s">your account maintenance page</a>. If you choose not to participate, your ratings of other users will be permanently deleted and the \'Peer Rating\' box will disappear from your user page.</p>'),
-			       $GLOBALS['sys_name'],
+			       fusionforge_get_config ('core', 'forge_name'),
 			       util_make_url ("/account/"));
 
 } else if ($me && !$me->usesRatings()) { ?>

Modified: trunk/gforge/www/mail/admin/index.php
===================================================================
--- trunk/gforge/www/mail/admin/index.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/mail/admin/index.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -234,7 +234,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.'), fusionforge_get_config ('core', 'forge_name')).'</p>';
 		echo '<ul>
 			<li>
 				<a href="'.getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&amp;add_list=1">'._('Add Mailing List').'</a>

Modified: trunk/gforge/www/my/diary.php
===================================================================
--- trunk/gforge/www/my/diary.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/my/diary.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -100,7 +100,7 @@
 							
 							$to = ''; // send to noreply@
 							$subject = sprintf (_("[%s User Notes: %s] %s"),
-									    $GLOBALS['sys_name'],
+									    fusionforge_get_config ('core', 'forge_name'),
 									    $u->getRealName(),
 									    stripslashes($summary)) ;
 							$body = util_line_wrap(stripslashes($details)) ;
@@ -112,7 +112,7 @@
 
 %s
 ",
-								   $GLOBALS['sys_name'],
+								   fusionforge_get_config ('core', 'forge_name'),
 								   util_make_url ("/developer/monitor.php?diary_user=". user_getid())) ;
 							
 							util_send_message($to, $subject, $body, $to, $tolist);

Modified: trunk/gforge/www/news/admin/index.php
===================================================================
--- trunk/gforge/www/news/admin/index.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/news/admin/index.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -151,7 +151,7 @@
 		unset($GLOBALS['editor_was_set_up']);
 		
 		echo '<p>
-		<strong>'.sprintf(_('If this item is on the %1$s home page and you edit it, it will be removed from the home page.'), $GLOBALS['sys_name']).'</strong><br /></p>
+		<strong>'.sprintf(_('If this item is on the %1$s home page and you edit it, it will be removed from the home page.'), fusionforge_get_config ('core', 'forge_name')).'</strong><br /></p>
 		<input type="submit" name="submit" value="'._('Submit').'" />
 		</form>';
 
@@ -342,7 +342,7 @@
 
 } else {
 
-	exit_error(_('Permission denied.'),sprintf(_('You have to be an admin on the project you are editing or a member of the %s News team.'), $GLOBALS['sys_name']));
+	exit_error(_('Permission denied.'),sprintf(_('You have to be an admin on the project you are editing or a member of the %s News team.'), fusionforge_get_config ('core', 'forge_name')));
 
 }
 

Modified: trunk/gforge/www/news/submit.php
===================================================================
--- trunk/gforge/www/news/submit.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/news/submit.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -130,7 +130,7 @@
 	$group = group_get_object($group_id);
 	echo '
 		<p>
-		'. sprintf(_('You can post news about your project if you are an admin on your project. You may also post "help wanted" notes if your project needs help.</p><p>All posts <b>for your project</b> will appear instantly on your project summary page. Posts that are of special interest to the community will have to be approved by a member of the %1$s news team before they will appear on the %1$s home page.</p><p>You may include URLs, but not HTML in your submissions.</p><p>URLs that start with http:// are made clickable.'), $GLOBALS['sys_name']) .'</p>' . $jsfunc . 
+		'. sprintf(_('You can post news about your project if you are an admin on your project. You may also post "help wanted" notes if your project needs help.</p><p>All posts <b>for your project</b> will appear instantly on your project summary page. Posts that are of special interest to the community will have to be approved by a member of the %1$s news team before they will appear on the %1$s home page.</p><p>You may include URLs, but not HTML in your submissions.</p><p>URLs that start with http:// are made clickable.'), fusionforge_get_config ('core', 'forge_name')) .'</p>' . $jsfunc . 
 		'
 		<form action="'.getStringFromServer('PHP_SELF').'" method="post">
 		<input type="hidden" name="group_id" value="'.$group_id.'" />

Modified: trunk/gforge/www/people/index.php
===================================================================
--- trunk/gforge/www/people/index.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/people/index.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -58,7 +58,7 @@
 
 	people_header(array('title'=>_('Help Wanted System')));
 
-	printf(_('<p>The %1$s Project Help Wanted board is for non-commercial, project volunteer openings. Commercial use is prohibited.</p><p>Project listings remain live for two weeks, or until closed by the poster, whichever comes first. (Project administrators may always re-post expired openings.)</p><p>Browse through the category menu to find projects looking for your help.</p><p>If you\'re a project admin, log in and submit help wanted requests through your project administration page.</p><p>To suggest new job categories, submit a request via the support manager.</p>'), $GLOBALS['sys_name']);
+	printf(_('<p>The %1$s Project Help Wanted board is for non-commercial, project volunteer openings. Commercial use is prohibited.</p><p>Project listings remain live for two weeks, or until closed by the poster, whichever comes first. (Project administrators may always re-post expired openings.)</p><p>Browse through the category menu to find projects looking for your help.</p><p>If you\'re a project admin, log in and submit help wanted requests through your project administration page.</p><p>To suggest new job categories, submit a request via the support manager.</p>'), fusionforge_get_config ('core', 'forge_name'));
 
 	echo people_show_category_table();
 

Modified: trunk/gforge/www/people/people_utils.php
===================================================================
--- trunk/gforge/www/people/people_utils.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/people/people_utils.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -400,7 +400,7 @@
 	$title_arr[]=_('Title');
 	$title_arr[]=_('Category');
 	$title_arr[]=_('Date Opened');
-	$title_arr[]= sprintf(_('%1$s project'), $GLOBALS['sys_name']);
+	$title_arr[]= sprintf(_('%1$s project'), fusionforge_get_config ('core', 'forge_name'));
 
 	$return = $GLOBALS['HTML']->listTableTop ($title_arr);
 

Modified: trunk/gforge/www/project/admin/vhost.php
===================================================================
--- trunk/gforge/www/project/admin/vhost.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/project/admin/vhost.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -108,7 +108,7 @@
 
 <p>&nbsp;</p>
 
-<?php printf(_('<strong><span style="text-decoration:underline">Add New Virtual Host</span></strong><p>To add a new virtual host - simply point a <strong>CNAME</strong> for <em>yourhost.org</em> at <strong>%1$s.%2$s</strong>.  %3$s does not currently host mail (i.e. cannot be an MX) or DNS</strong>.  <p>Clicking on "create" will schedule the creation of the Virtual Host.  This will be synced to the project webservers - such that <em>yourhost.org</em> will display the material at <em>%4$s.%5$s</em>.'), $group->getUnixName(), $GLOBALS['sys_default_domain'], $GLOBALS['sys_name'], $group->getUnixName(), $GLOBALS['sys_default_domain']) ?>
+<?php printf(_('<strong><span style="text-decoration:underline">Add New Virtual Host</span></strong><p>To add a new virtual host - simply point a <strong>CNAME</strong> for <em>yourhost.org</em> at <strong>%1$s.%2$s</strong>.  %3$s does not currently host mail (i.e. cannot be an MX) or DNS</strong>.  <p>Clicking on "create" will schedule the creation of the Virtual Host.  This will be synced to the project webservers - such that <em>yourhost.org</em> will display the material at <em>%4$s.%5$s</em>.'), $group->getUnixName(), $GLOBALS['sys_default_domain'], fusionforge_get_config ('core', 'forge_name'), $group->getUnixName(), $GLOBALS['sys_default_domain']) ?>
 <p>
 
 <form name="new_vhost" action="<?php echo getStringFromServer('PHP_SELF').'?group_id='.$group->getID().'&createvhost=1'; ?>" method="post"> 

Modified: trunk/gforge/www/register/projectinfo.php
===================================================================
--- trunk/gforge/www/register/projectinfo.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/register/projectinfo.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -46,7 +46,7 @@
 if ($sys_project_reg_restricted) {
 	session_require(array('group'=>'1','admin_flags'=>'A'),
 			sprintf (_('Project registration is restricted on %s, and only administrators can create new projects.'),
-				 $sys_name));
+				 fusionforge_get_config ('core', 'forge_name')));
 } elseif (!session_loggedin()) {
 	exit_not_logged_in();
 }
@@ -104,7 +104,7 @@
 	
 			?>
 	
-			<p><?php printf(_('Your project has been submitted to the %1$s administrators. Within 72 hours, you will receive notification of their decision and further instructions.<p/>Thank you for choosing %1$s'), $GLOBALS['sys_name'])?>
+			<p><?php printf(_('Your project has been submitted to the %1$s administrators. Within 72 hours, you will receive notification of their decision and further instructions.<p/>Thank you for choosing %1$s'), fusionforge_get_config ('core', 'forge_name'))?>
 			</p>
 	
 			<?php
@@ -136,7 +136,7 @@
 
 <input size="40" maxlength="40" type="text" name="full_name" value="<?php echo htmlspecialchars(stripslashes($full_name)); ?>"/>
 
-<?php printf(_('<h3>2. Project Purpose And Summarization</h3><strong> Please provide detailed, accurate description of your project and what %1$s resources and in which way you plan to use. This description will be the basis for the approval or rejection of your project\'s hosting on %1$s, and later, to ensure that you are using the services in the intended way. This description will not be used as a public description of your project. It must be written in English.</strong>'), $GLOBALS['sys_name'])?>
+<?php printf(_('<h3>2. Project Purpose And Summarization</h3><strong> Please provide detailed, accurate description of your project and what %1$s resources and in which way you plan to use. This description will be the basis for the approval or rejection of your project\'s hosting on %1$s, and later, to ensure that you are using the services in the intended way. This description will not be used as a public description of your project. It must be written in English.</strong>'), fusionforge_get_config ('core', 'forge_name'))?>
 <p/>
 <textarea name="purpose" cols="70" rows="10">
 <?php echo htmlspecialchars(stripslashes($purpose)); ?>

Modified: trunk/gforge/www/reporting/groupadded_graph.php
===================================================================
--- trunk/gforge/www/reporting/groupadded_graph.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/reporting/groupadded_graph.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -68,7 +68,7 @@
 //$graph->SetMargin(10,10,25,10);
 $graph->title->Set("Projects Added ".$report->getSpanName()
 	." (".date('m/d/Y',$report->getStartDate()) ."-". date('m/d/Y',$report->getEndDate()) .")");
-$graph->subtitle->Set($sys_name);
+$graph->subtitle->Set(fusionforge_get_config ('core', 'forge_name'));
 //$graph->xaxis-> title->Set("Date" );
 //$graph->yaxis-> title->Set("Number" ); 
 

Modified: trunk/gforge/www/reporting/groupcum_graph.php
===================================================================
--- trunk/gforge/www/reporting/groupcum_graph.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/reporting/groupcum_graph.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -68,7 +68,7 @@
 //$graph->SetMargin(10,10,25,10);
 $graph->title->Set("Cumulative Projects ".$report->getSpanName()
 	." (".date('m/d/Y',$report->getStartDate()) ."-". date('m/d/Y',$report->getEndDate()) .")");
-$graph->subtitle->Set($sys_name);
+$graph->subtitle->Set(fusionforge_get_config ('core', 'forge_name'));
 //$graph->xaxis-> title->Set("Date" );
 //$graph->yaxis-> title->Set("Number" ); 
 

Modified: trunk/gforge/www/reporting/projectact_graph.php
===================================================================
--- trunk/gforge/www/reporting/projectact_graph.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/reporting/projectact_graph.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -215,7 +215,7 @@
 //
 $graph->title->Set("Project Activity For: ".util_unconvert_htmlspecialchars($g->getPublicName()). 
 	" (".date('Y-m-d',$report->getStartDate()) ." to ". date('Y-m-d',$report->getEndDate()) .")");
-$graph->subtitle->Set($sys_name);
+$graph->subtitle->Set(fusionforge_get_config ('core', 'forge_name'));
 //$graph->xaxis-> title->Set("Date" );
 //$graph->yaxis-> title->Set("Number" ); 
 

Modified: trunk/gforge/www/reporting/projecttime_graph.php
===================================================================
--- trunk/gforge/www/reporting/projecttime_graph.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/reporting/projecttime_graph.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -76,7 +76,7 @@
 $arr['user']='By User';
 
 $graph->title->Set("Time Report ".$arr[$type]." (".date('m/d/Y',$start) ."-". date('m/d/Y',$end) .")");
-$graph->subtitle->Set($sys_name);
+$graph->subtitle->Set(fusionforge_get_config ('core', 'forge_name'));
 
 report_pie_arr($report->labels,$report->getData());
 

Modified: trunk/gforge/www/reporting/siteact_graph.php
===================================================================
--- trunk/gforge/www/reporting/siteact_graph.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/reporting/siteact_graph.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -134,7 +134,7 @@
 //	Titles
 //
 $graph->title->Set("Site-Wide Activity (".date('m/d/Y',$report->getStartDate()) ."-". date('m/d/Y',$report->getEndDate()) .")");
-$graph->subtitle->Set($sys_name);
+$graph->subtitle->Set(fusionforge_get_config ('core', 'forge_name'));
 //$graph->xaxis-> title->Set("Date" );
 //$graph->yaxis-> title->Set("Number" ); 
 

Modified: trunk/gforge/www/reporting/sitetime_graph.php
===================================================================
--- trunk/gforge/www/reporting/sitetime_graph.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/reporting/sitetime_graph.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -75,7 +75,7 @@
 $arr['user']='By User';
 
 $graph->title->Set("Time Report ".$arr[$type]." (".date('m/d/Y',$start) ."-". date('m/d/Y',$end) .")");
-$graph->subtitle->Set($sys_name);
+$graph->subtitle->Set(fusionforge_get_config ('core', 'forge_name'));
 
 report_pie_arr($report->labels,$report->getData());
 

Modified: trunk/gforge/www/reporting/sitetimebar_graph.php
===================================================================
--- trunk/gforge/www/reporting/sitetimebar_graph.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/reporting/sitetimebar_graph.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -92,7 +92,7 @@
 
 // Setup the titles
 $graph->title->Set("Hours Recorded (".date('m/d/Y',$start) ."-". date('m/d/Y',$end) .")");
-$graph->subtitle->Set($sys_name);
+$graph->subtitle->Set(fusionforge_get_config ('core', 'forge_name'));
 $graph->xaxis->title->Set("Date");
 $graph->yaxis->title->Set("Hours");
 

Modified: trunk/gforge/www/reporting/toolspie_graph.php
===================================================================
--- trunk/gforge/www/reporting/toolspie_graph.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/reporting/toolspie_graph.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -135,7 +135,7 @@
 $arr[6]='Tasks';
 $arr[7]='Downloads';
 $graph->title->Set($arr[$datatype]." By Project (".date('m/d/Y',$start) ."-". date('m/d/Y',$end) .")");
-$graph->subtitle->Set($sys_name);
+$graph->subtitle->Set(fusionforge_get_config ('core', 'forge_name'));
 
 // Create the tracker open plot
 report_pie_arr(util_result_column_to_array($res,0), util_result_column_to_array($res,1));

Modified: trunk/gforge/www/reporting/trackerpie_graph.php
===================================================================
--- trunk/gforge/www/reporting/trackerpie_graph.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/reporting/trackerpie_graph.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -123,7 +123,7 @@
 $arr['resolution']='By Resolution';
 $arr['assignee']='By Assignee';
 $graph->title->Set($arr[$area]." (".date('m/d/Y',$start) ."-". date('m/d/Y',$end) .")");
-$graph->subtitle->Set($sys_name);
+$graph->subtitle->Set(fusionforge_get_config ('core', 'forge_name'));
 
 // Create the tracker open plot
 report_pie_arr(util_result_column_to_array($res,0), util_result_column_to_array($res,1));

Modified: trunk/gforge/www/reporting/useract_graph.php
===================================================================
--- trunk/gforge/www/reporting/useract_graph.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/reporting/useract_graph.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -132,7 +132,7 @@
 //
 $graph->title->Set("User Activity For: ".$u->getRealName() 
 	." (".date('m/d/Y',$report->getStartDate()) ."-". date('m/d/Y',$report->getEndDate()) .")");
-$graph->subtitle->Set($sys_name);
+$graph->subtitle->Set(fusionforge_get_config ('core', 'forge_name'));
 //$graph->xaxis-> title->Set("Date" );
 //$graph->yaxis-> title->Set("Number" ); 
 

Modified: trunk/gforge/www/reporting/useradded_graph.php
===================================================================
--- trunk/gforge/www/reporting/useradded_graph.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/reporting/useradded_graph.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -68,7 +68,7 @@
 //$graph->SetMargin(10,10,25,10);
 $graph->title->Set("Users Added ".$report->getSpanName()
 	." (".date('m/d/Y',$report->getStartDate()) ."-". date('m/d/Y',$report->getEndDate()) .")");
-$graph->subtitle->Set($sys_name);
+$graph->subtitle->Set(fusionforge_get_config ('core', 'forge_name'));
 //$graph->xaxis-> title->Set("Date" );
 //$graph->yaxis-> title->Set("Number" ); 
 

Modified: trunk/gforge/www/reporting/usercum_graph.php
===================================================================
--- trunk/gforge/www/reporting/usercum_graph.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/reporting/usercum_graph.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -68,7 +68,7 @@
 //$graph->SetMargin(10,10,25,10);
 $graph->title->Set("Cumulative Users ".$report->getSpanName()
 	." (".date('m/d/Y',$report->getStartDate()) ."-". date('m/d/Y',$report->getEndDate()) .")");
-$graph->subtitle->Set($sys_name);
+$graph->subtitle->Set(fusionforge_get_config ('core', 'forge_name'));
 //$graph->xaxis-> title->Set("Date" );
 //$graph->yaxis-> title->Set("Number" ); 
 

Modified: trunk/gforge/www/reporting/usertime_graph.php
===================================================================
--- trunk/gforge/www/reporting/usertime_graph.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/reporting/usertime_graph.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -75,7 +75,7 @@
 $arr['subproject']='By Subproject';
 
 $graph->title->Set("Time Report ".$arr[$type]." (".date('m/d/Y',$start) ."-". date('m/d/Y',$end) .")");
-$graph->subtitle->Set($sys_name);
+$graph->subtitle->Set(fusionforge_get_config ('core', 'forge_name'));
 
 // Create the tracker open plot
 //$data  =& $report->getData();

Modified: trunk/gforge/www/scm/reporting/commits_graph.php
===================================================================
--- trunk/gforge/www/scm/reporting/commits_graph.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/scm/reporting/commits_graph.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -89,7 +89,7 @@
 
 //$graph->title->Set("Commits By User (".date('m/d/Y',$start) ."-". date('m/d/Y',$end) .")");
 $graph->title->Set(utf8_decode(_("Commits By User")." (".strftime('%x',$start) ." - ". strftime('%x',$end) .")"));
-$graph->subtitle->Set($sys_name);
+$graph->subtitle->Set(fusionforge_get_config ('core', 'forge_name'));
 
 // Create the tracker open plot
 report_pie_arr(util_result_column_to_array($res,0), util_result_column_to_array($res,1), 0);

Modified: trunk/gforge/www/scm/reporting/commitstime_graph.php
===================================================================
--- trunk/gforge/www/scm/reporting/commitstime_graph.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/scm/reporting/commitstime_graph.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -79,7 +79,7 @@
 
 //$graph->SetMargin(10,10,25,10);
 $graph->title->Set($g->getPublicName()." Commits Over Time: ".$report->start_date." - ".$report->end_date);
-$graph->subtitle->Set($sys_name);
+$graph->subtitle->Set(fusionforge_get_config ('core', 'forge_name'));
 //$graph->xaxis-> title->Set("Date" );
 //$graph->yaxis-> title->Set("Number" ); 
 

Modified: trunk/gforge/www/sendmessage.php
===================================================================
--- trunk/gforge/www/sendmessage.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/sendmessage.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -82,7 +82,7 @@
 		$to=eregi_replace('_maillink_','@',$toaddress);
 		$to = util_remove_CRLF($to);
 		util_send_message($to,stripslashes($subject),stripslashes($body),$email,'',$name);
-		$HTML->header(array('title'=>$GLOBALS['sys_name'].' ' ._('Contact')   ));
+		$HTML->header(array('title'=>fusionforge_get_config ('core', 'forge_name').' ' ._('Contact')   ));
 		echo '<p>'._('Message has been sent').'.</p>';
 		$HTML->footer(array());
 		exit;
@@ -93,7 +93,7 @@
 		$to=db_result($result,0,'email');
 		$to = util_remove_CRLF($to);
 		util_send_message($to,stripslashes($subject),stripslashes($body),$email,'',$name);
-		$HTML->header(array('title'=>$GLOBALS['sys_name'].' '._('Contact')));
+		$HTML->header(array('title'=>fusionforge_get_config ('core', 'forge_name').' '._('Contact')));
 		echo '<p>'._('Message has been sent').'</p>';
 		$HTML->footer(array());
 		exit;
@@ -116,7 +116,7 @@
 }
 $subject = getStringFromRequest('subject');
 
-$HTML->header(array('title'=>$GLOBALS['sys_name'].' Staff'));
+$HTML->header(array('title'=>fusionforge_get_config ('core', 'forge_name').' Staff'));
 
 ?>
 

Modified: trunk/gforge/www/stats/graphs.php
===================================================================
--- trunk/gforge/www/stats/graphs.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/stats/graphs.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -15,7 +15,7 @@
 // require you to be a member of the sfstats group (group_id = 11084)
 session_require( array('group'=>$sys_stats_group) );
 
-$HTML->header(array('title'=>sprintf(_('%1$s Site Statistics'), $GLOBALS['sys_name'])));
+$HTML->header(array('title'=>sprintf(_('%1$s Site Statistics'), fusionforge_get_config ('core', 'forge_name'))));
 
 echo "\n\n";
 

Modified: trunk/gforge/www/stats/i18n.php
===================================================================
--- trunk/gforge/www/stats/i18n.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/stats/i18n.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -15,8 +15,8 @@
 // require you to be a member of the sfstats group
 session_require( array('group'=>$sys_stats_group) );
 
-$HTML->header(array('title' => sprintf(_('%1$s I18n Statistics'), $GLOBALS['sys_name'])));
-echo "<h1>".sprintf(_('Languages Distributions'), $GLOBALS['sys_name'])." </h1>";
+$HTML->header(array('title' => sprintf(_('%1$s I18n Statistics'), fusionforge_get_config ('core', 'forge_name'))));
+echo "<h1>".sprintf(_('Languages Distributions'), fusionforge_get_config ('core', 'forge_name'))." </h1>";
 echo $GLOBALS['HTML']->listTableTop(array(_('Language')."",_('Users')."","%"));
 
 $total=db_result(db_query_params('SELECT count(user_name) AS total FROM users', array()),0,'total');

Modified: trunk/gforge/www/stats/index.php
===================================================================
--- trunk/gforge/www/stats/index.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/stats/index.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -17,7 +17,7 @@
 // require you to be a member of the sfstats group
 session_require( array('group'=>$sys_stats_group) );
 
-$HTML->header(array('title'=>sprintf(_('%1$s Site Statistics'), $GLOBALS['sys_name'])));
+$HTML->header(array('title'=>sprintf(_('%1$s Site Statistics'), fusionforge_get_config ('core', 'forge_name'))));
 
 //
 // BEGIN PAGE CONTENT CODE

Modified: trunk/gforge/www/stats/projects.php
===================================================================
--- trunk/gforge/www/stats/projects.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/stats/projects.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -23,7 +23,7 @@
 // require you to be a member of the sfstats group (group_id = 11084)
 session_require( array('group'=>$sys_stats_group) );
 
-$HTML->header(array('title'=>sprintf(_('%1$s Site Statistics'), $GLOBALS['sys_name'])));
+$HTML->header(array('title'=>sprintf(_('%1$s Site Statistics'), fusionforge_get_config ('core', 'forge_name'))));
 
 ?>
 <h1><?php echo _('Project Statistical Comparisons'); ?></h1>

Modified: trunk/gforge/www/survey/privacy.php
===================================================================
--- trunk/gforge/www/survey/privacy.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/survey/privacy.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -37,6 +37,6 @@
 <?php echo _('<p>The information collected in these surveys will never be sold to third parties or used to solicit you to purchase any goods or services.</p><p>This information is being gathered to build a profile of the projects and developers being surveyed. That profile will help visitors to the site understand the quality of a given project.</p><p>The ID\'s of those who answer surveys are suppressed and not viewable by project administrators or the public or third parties.</p><p>The information gathered is used only in aggregate form, not to single out specific users or developers.</p><p>If any changes are made to this policy, it will affect only future data that is collected and the user will of course have the ability to \'opt-out\'.'); ?>
 </p>
 
-<p><strong><?php printf(_('The %1$s Team'), $GLOBALS['sys_name']); ?></strong></p>
+<p><strong><?php printf(_('The %1$s Team'), fusionforge_get_config ('core', 'forge_name')); ?></strong></p>
 
 <?php echo $HTML->footer(array()); ?>

Modified: trunk/gforge/www/survey/survey_resp.php
===================================================================
--- trunk/gforge/www/survey/survey_resp.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/survey/survey_resp.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -66,7 +66,7 @@
 <p>&nbsp;</p>
 <?php echo _('Regards'); ?>,
 <p>&nbsp;</p>
-<strong><?php printf(_('The %1$s Crew'), $GLOBALS['sys_name']); ?></strong>
+<strong><?php printf(_('The %1$s Crew'), fusionforge_get_config ('core', 'forge_name')); ?></strong>
 <p>&nbsp;</p>
 <?php
 /*

Modified: trunk/gforge/www/terms.php
===================================================================
--- trunk/gforge/www/terms.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/terms.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -35,11 +35,11 @@
 
 <table width="100%" cellpadding="5" cellspacing="0" border="0">
 <tr><td width="65%" valign="top">
-	<h3><?php printf (_('%1$s Terms of Use'), $GLOBALS['sys_name']); ?></h3>
+	<h3><?php printf (_('%1$s Terms of Use'), fusionforge_get_config ('core', 'forge_name')); ?></h3>
 <p>
 
 	<?php printf (_('These are the terms and conditions under which you are allowed to use the %1$s service.  They are empty by default, but the administrator(s) of the service can use this page to publish their local requirements if needed.'),
-		      $GLOBALS['sys_name']) ;
+		      fusionforge_get_config ('core', 'forge_name')) ;
 ; ?>
 
 </p>

Modified: trunk/gforge/www/themes/gforge-simple-theme/Theme.class.php
===================================================================
--- trunk/gforge/www/themes/gforge-simple-theme/Theme.class.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/themes/gforge-simple-theme/Theme.class.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -64,9 +64,9 @@
 	 */
 	function headerStart($params) {
 		if (!$params['title']) {
-			$params['title'] =  $GLOBALS['sys_name'];
+			$params['title'] =  fusionforge_get_config ('core', 'forge_name');
 		} else {
-			$params['title'] =  $GLOBALS['sys_name'] . ': ' . $params['title'];
+			$params['title'] =  fusionforge_get_config ('core', 'forge_name') . ': ' . $params['title'];
 		}
 		print '<?xml version="1.0" encoding="utf-8"';
 		?>
@@ -84,7 +84,7 @@
 <title><?php echo $params['title']; ?></title>
 		<?php $this->headerLink(); ?>
 		<?php	if (isset($GLOBALS['group_id'])) {
-			$activity = '<link rel="alternate" title="'.$GLOBALS['sys_name'].' - New Activity RSS" href="'.
+			$activity = '<link rel="alternate" title="'.fusionforge_get_config ('core', 'forge_name').' - New Activity RSS" href="'.
 			util_make_url ('/export/rss20_activity.php?group_id='.$GLOBALS['group_id']).
 			'" type="application/rss+xml"/>';
 			echo $activity;

Modified: trunk/gforge/www/themes/osx/Theme.class.php
===================================================================
--- trunk/gforge/www/themes/osx/Theme.class.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/themes/osx/Theme.class.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -57,8 +57,6 @@
 	 * @param	array	Header parameters array
 	 */
 	function header($params) {
-		global $sys_name;
-
 		$this->headerStart($params); ?>
 
 <link rel="stylesheet" type="text/css" href="<?php echo util_make_uri ('/themes/osx/css/theme.css'); ?>" />

Modified: trunk/gforge/www/themes/ultralite/Theme.class.php
===================================================================
--- trunk/gforge/www/themes/ultralite/Theme.class.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/themes/ultralite/Theme.class.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -17,11 +17,10 @@
 		{
 		header("Location:".$_POST['menuList']);		
 		}
-		global $sys_name;
 		if (!$params['title']) {
-			$params['title'] = "$sys_name";
+			$params['title'] = fusionforge_get_config ('core', 'forge_name');
 		} else {
-			$params['title'] = "$sys_name: " . $params['title'];
+			$params['title'] = fusionforge_get_config ('core', 'forge_name').": " . $params['title'];
 		}
 		print '<?xml version="1.0" encoding="utf-8"?>';
 		?>

Modified: trunk/gforge/www/top/index.php
===================================================================
--- trunk/gforge/www/top/index.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/top/index.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -29,9 +29,9 @@
 $HTML->header(array('title'=>_('Top Projects')));
 ?>
 
-<h1><?php printf(_('Top %1$s Projects'), $GLOBALS['sys_name']); ?></h1>
+<h1><?php printf(_('Top %1$s Projects'), fusionforge_get_config ('core', 'forge_name')); ?></h1>
 
-<p><?php printf(_('We track many project usage statistics on %1$s, and display here the top ranked projects in several categories.'), $GLOBALS['sys_name']); ?></p>
+<p><?php printf(_('We track many project usage statistics on %1$s, and display here the top ranked projects in several categories.'), fusionforge_get_config ('core', 'forge_name')); ?></p>
 <ul>
 <li><a href="mostactive.php?type=week"><?php echo _('Most Active This Week'); ?></a></li>
 <li><a href="mostactive.php"><?php echo _('Most Active All Time'); ?></a></li>

Modified: trunk/gforge/www/top/toplist.php
===================================================================
--- trunk/gforge/www/top/toplist.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/gforge/www/top/toplist.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -38,7 +38,7 @@
 }
 else if ($type == 'pageviews_proj') {
 	$res_top = $stats->getTopPageViews();
-	$title = sprintf(_('Top Weekly Project Pageviews at *.%1$s (from impressions of %2$s logo)'), $GLOBALS['sys_default_domain'], $GLOBALS['sys_name']);
+	$title = sprintf(_('Top Weekly Project Pageviews at *.%1$s (from impressions of %2$s logo)'), $GLOBALS['sys_default_domain'], fusionforge_get_config ('core', 'forge_name'));
 	$column1 = _('Pageviews');
 }
 else if ($type == 'forumposts_week') {

Modified: trunk/tools/jpgraph_pietest.php
===================================================================
--- trunk/tools/jpgraph_pietest.php	2010-03-15 13:02:27 UTC (rev 9059)
+++ trunk/tools/jpgraph_pietest.php	2010-03-15 13:02:41 UTC (rev 9060)
@@ -62,7 +62,7 @@
 
 //$graph->title->Set(_("Commits By User")." (".date('m/d/Y',$start) ."-". date('m/d/Y',$end) .")");
 $graph->title->Set(utf8_decode(_("Commits By User")." (".strftime('%x',$start) ." - ". strftime('%x',$end) .")"));
-$graph->subtitle->Set($sys_name);
+$graph->subtitle->Set(fusionforge_get_config ('core', 'forge_name'));
 
 // Create the tracker open plot
 ////report_pie_arr(util_result_column_to_array($res,0), util_result_column_to_array($res,1));




More information about the Fusionforge-commits mailing list