[Fusionforge-commits] r9613 - in trunk: gforge/common/include gforge/cronjobs gforge/plugins/mediawiki/www gforge/plugins/projects_hierarchy/www gforge/www gforge/www/admin/trove gforge/www/export gforge/www/search/include/renderers gforge/www/softwaremap gforge/www/themes/gforge-simple-theme gforge/www/themes/ultralite gforge/www/trove tests/code/deprecations

Roland Mas lolando at libremir.placard.fr.eu.org
Tue Apr 27 21:38:56 CEST 2010


Author: lolando
Date: 2010-04-27 21:38:55 +0200 (Tue, 27 Apr 2010)
New Revision: 9613

Modified:
   trunk/gforge/common/include/Navigation.class.php
   trunk/gforge/common/include/config-vars.php
   trunk/gforge/common/include/session.php
   trunk/gforge/cronjobs/massmail.php
   trunk/gforge/plugins/mediawiki/www/LocalSettings.php
   trunk/gforge/plugins/projects_hierarchy/www/softwaremap.php
   trunk/gforge/www/admin/trove/trove_cat_edit.php
   trunk/gforge/www/export/rss20_activity.php
   trunk/gforge/www/export/rss20_docman.php
   trunk/gforge/www/export/rss20_forum.php
   trunk/gforge/www/export/rss20_newreleases.php
   trunk/gforge/www/export/rss20_news.php
   trunk/gforge/www/export/rss20_tasks.php
   trunk/gforge/www/export/rss20_tracker.php
   trunk/gforge/www/export/rss_sfnewreleases.php
   trunk/gforge/www/search/include/renderers/ProjectRssSearchRenderer.class.php
   trunk/gforge/www/softwaremap/trove_list.php
   trunk/gforge/www/source.php
   trunk/gforge/www/themes/gforge-simple-theme/Theme.class.php
   trunk/gforge/www/themes/ultralite/Theme.class.php
   trunk/gforge/www/trove/index.php
   trunk/tests/code/deprecations/DeprecationsTest.php
Log:
Config API: misc. variables

Modified: trunk/gforge/common/include/Navigation.class.php
===================================================================
--- trunk/gforge/common/include/Navigation.class.php	2010-04-27 19:32:48 UTC (rev 9612)
+++ trunk/gforge/common/include/Navigation.class.php	2010-04-27 19:38:55 UTC (rev 9613)
@@ -613,15 +613,15 @@
         }
         
         /** Create the HTML code for the "Show Source" link if
-	 *  $sys_show_source is set, otherwise "". If $asHTML is set
-	 *  to false, it returns NULL when $sys_show_source is not
+	 *  forge_get_config('show_source') is set, otherwise "". If $asHTML is set
+	 *  to false, it returns NULL when forge_get_config('show_source') is not
 	 *  set, otherwise an array with the following structure:
 	 *  $result['url']: URL of the link to the source code viewer;
 	 *  $result['title']: Title of the link.
 	 */
         function getShowSource($asHTML=true) {
-                global $sys_show_source;
-                if ($sys_show_source) {
+
+                if (forge_get_config('show_source')) {
                         $res['url'] = util_make_url('/source.php?file='.getStringFromServer('SCRIPT_NAME'));
                         $res['title'] = _('Show source');
                 } else {

Modified: trunk/gforge/common/include/config-vars.php
===================================================================
--- trunk/gforge/common/include/config-vars.php	2010-04-27 19:32:48 UTC (rev 9612)
+++ trunk/gforge/common/include/config-vars.php	2010-04-27 19:38:55 UTC (rev 9613)
@@ -90,6 +90,10 @@
 forge_define_config_item ('url_prefix', 'core', $GLOBALS['sys_urlprefix']) ;
 forge_define_config_item ('images_url', 'core', $GLOBALS['sys_images_url']) ;
 forge_define_config_item ('images_secure_url', 'core', $GLOBALS['sys_images_secure_url']) ;
+forge_define_config_item ('admin_email', 'core', $GLOBALS['sys_admin_email']) ;
+forge_define_config_item ('session_key', 'core', $GLOBALS['sys_session_key']) ;
+forge_define_config_item ('show_source', 'core', $GLOBALS['sys_show_source']) ;
+forge_define_config_item ('default_trove_cat', 'core', $GLOBALS['default_trove_cat']) ;
 // forge_define_config_item ('', 'core', $GLOBALS['sys_']) ;
 
 /* Long-term:

Modified: trunk/gforge/common/include/session.php
===================================================================
--- trunk/gforge/common/include/session.php	2010-04-27 19:32:48 UTC (rev 9612)
+++ trunk/gforge/common/include/session.php	2010-04-27 19:38:55 UTC (rev 9613)
@@ -47,7 +47,7 @@
  */
 function session_build_session_cookie($user_id) {
 	$session_serial = $user_id.'-*-'.time().'-*-'.getStringFromServer('REMOTE_ADDR').'-*-'.getStringFromServer('HTTP_USER_AGENT');
-	$session_serial_hash = md5($session_serial.$GLOBALS['sys_session_key']);
+	$session_serial_hash = md5($session_serial.forge_get_config('session_key'));
 	$session_serial_cookie = base64_encode($session_serial).'-*-'.$session_serial_hash;
 	return $session_serial_cookie;
 }
@@ -75,7 +75,7 @@
 
 	list ($session_serial, $hash) = explode('-*-', $session_cookie);
 	$session_serial = base64_decode($session_serial);
-	$new_hash = md5($session_serial.$GLOBALS['sys_session_key']);
+	$new_hash = md5($session_serial.forge_get_config('session_key'));
 
 	if ($hash != $new_hash) {
 		return false;

Modified: trunk/gforge/cronjobs/massmail.php
===================================================================
--- trunk/gforge/cronjobs/massmail.php	2010-04-27 19:32:48 UTC (rev 9612)
+++ trunk/gforge/cronjobs/massmail.php	2010-04-27 19:38:55 UTC (rev 9613)
@@ -80,9 +80,9 @@
 	$hrs = time()/(60*60);
 	// Send reminder every second day at 11am
 	if (($hrs%24)==11 && (($hrs/24)%2)==1) {
-		global $sys_admin_email;
+
 		util_send_message(
-			"$sys_admin_email",
+			forge_get_config('admin_email'),
 			"ATT: Problems with massmail cron script",
 			"This is automatically generated message from\n
 the mass mailing cron script of ".forge_get_config ('forge_name')."\n

Modified: trunk/gforge/plugins/mediawiki/www/LocalSettings.php
===================================================================
--- trunk/gforge/plugins/mediawiki/www/LocalSettings.php	2010-04-27 19:32:48 UTC (rev 9612)
+++ trunk/gforge/plugins/mediawiki/www/LocalSettings.php	2010-04-27 19:38:55 UTC (rev 9613)
@@ -77,8 +77,8 @@
 $wgSitename         = $g->getPublicName() . " Wiki";
 $wgScriptPath       = "/plugins/mediawiki/wiki/$fusionforgeproject" ;
 
-$wgEmergencyContact = $sys_admin_email;
-$wgPasswordSender = $sys_admin_email;
+$wgEmergencyContact = forge_get_config('admin_email');
+$wgPasswordSender = forge_get_config('admin_email');
 
 $wgDBtype           = "postgres";
 $wgDBserver         = $sys_dbhost ;
@@ -117,7 +117,7 @@
 $GLOBALS['gfplugins'] = $gfplugins ;
 $GLOBALS['sys_lang'] = forge_get_config('default_language') ;
 $GLOBALS['sys_urlroot'] = forge_get_config('url_root');
-$GLOBALS['sys_session_key'] = $sys_session_key;
+$GLOBALS['sys_session_key'] = forge_get_config('session_key');
 $GLOBALS['sys_session_expire'] = $sys_session_expire;
 $GLOBALS['REMOTE_ADDR'] = getStringFromServer('REMOTE_ADDR') ;
 $GLOBALS['HTTP_USER_AGENT'] = getStringFromServer('HTTP_USER_AGENT') ;

Modified: trunk/gforge/plugins/projects_hierarchy/www/softwaremap.php
===================================================================
--- trunk/gforge/plugins/projects_hierarchy/www/softwaremap.php	2010-04-27 19:32:48 UTC (rev 9612)
+++ trunk/gforge/plugins/projects_hierarchy/www/softwaremap.php	2010-04-27 19:38:55 UTC (rev 9613)
@@ -26,7 +26,7 @@
 
 // assign default. 18 is 'topic'
 if (!isset($form_cat) || !$form_cat) {
-	$form_cat = $default_trove_cat;
+	$form_cat = forge_get_config('default_trove_cat');
 }
 
 $form_cat = intval($form_cat);

Modified: trunk/gforge/www/admin/trove/trove_cat_edit.php
===================================================================
--- trunk/gforge/www/admin/trove/trove_cat_edit.php	2010-04-27 19:32:48 UTC (rev 9612)
+++ trunk/gforge/www/admin/trove/trove_cat_edit.php	2010-04-27 19:38:55 UTC (rev 9613)
@@ -93,7 +93,7 @@
 
 if (getStringFromRequest("delete")) {
 	$form_trove_cat_id = getIntFromRequest('form_trove_cat_id');
-	if ($form_trove_cat_id==$default_trove_cat){
+	if ($form_trove_cat_id==forge_get_config('default_trove_cat')){
 		exit_error( _('Error In Trove Operation, can\'t delete trove category define as default in local.inc'));
 	}
 	trove_del_cat_id($form_trove_cat_id);

Modified: trunk/gforge/www/export/rss20_activity.php
===================================================================
--- trunk/gforge/www/export/rss20_activity.php	2010-04-27 19:32:48 UTC (rev 9612)
+++ trunk/gforge/www/export/rss20_activity.php	2010-04-27 19:38:55 UTC (rev 9613)
@@ -52,7 +52,7 @@
 	if ($rowwm = db_fetch_array($reswm)) {
 		$webmaster = $rowwm['user_name']."@".forge_get_config('users_host')." (".$rowwm['realname'].")";
 	} else {
-		$webmaster = $GLOBALS['sys_admin_email'];
+		$webmaster = forge_get_config('admin_email');
 	}
 
 	// ## one time output

Modified: trunk/gforge/www/export/rss20_docman.php
===================================================================
--- trunk/gforge/www/export/rss20_docman.php	2010-04-27 19:32:48 UTC (rev 9612)
+++ trunk/gforge/www/export/rss20_docman.php	2010-04-27 19:38:55 UTC (rev 9613)
@@ -70,7 +70,7 @@
 
 //**************************************************************++
 function beginFeed($groupname = "", $link = "") {
-	global  $sys_admin_email;
+
 	header("Content-Type: text/xml");
 	print '<?xml version="1.0" encoding="UTF-8"?>
 			<rss version="2.0">
@@ -81,7 +81,7 @@
 	print "  <description>".forge_get_config('forge_name')." Documents of \"".$groupname."\"</description>\n";
 	print "  <language>en-us</language>\n";
 	print "  <copyright>Copyright 2000-".date("Y")." ".forge_get_config('forge_name')."</copyright>\n";
-	print "  <webMaster>".$sys_admin_email."</webMaster>\n";
+	print "  <webMaster>".forge_get_config('admin_email')."</webMaster>\n";
 	print "  <lastBuildDate>".gmdate('D, d M Y G:i:s',time())." GMT</lastBuildDate>\n";
 	print "  <docs>http://blogs.law.harvard.edu/tech/rss</docs>\n";
 	print "  <image>\n";

Modified: trunk/gforge/www/export/rss20_forum.php
===================================================================
--- trunk/gforge/www/export/rss20_forum.php	2010-04-27 19:32:48 UTC (rev 9612)
+++ trunk/gforge/www/export/rss20_forum.php	2010-04-27 19:38:55 UTC (rev 9613)
@@ -275,7 +275,7 @@
 
 //*********************** HELPER FUNCTIONS ***************************************
 function beginForumFeed($feed_title, $feed_link, $feed_desc) {
-	global  $sys_admin_email;
+
 	header("Content-Type: text/xml");
 	print '<?xml version="1.0" encoding="UTF-8"?>
 			<rss version="2.0">
@@ -286,7 +286,7 @@
 	print "  <description>".$feed_desc."</description>\n";
 	print "  <language>en-us</language>\n";
 	print "  <copyright>Copyright 2000-".date("Y")." ".forge_get_config('forge_name')."</copyright>\n";
-	print "  <webMaster>".$sys_admin_email."</webMaster>\n";
+	print "  <webMaster>".forge_get_config('admin_email')."</webMaster>\n";
 	print "  <lastBuildDate>".gmdate('D, d M Y G:i:s',time())." GMT</lastBuildDate>\n";
 	print "  <docs>http://blogs.law.harvard.edu/tech/rss</docs>\n";
 	print "  <image>\n";

Modified: trunk/gforge/www/export/rss20_newreleases.php
===================================================================
--- trunk/gforge/www/export/rss20_newreleases.php	2010-04-27 19:32:48 UTC (rev 9612)
+++ trunk/gforge/www/export/rss20_newreleases.php	2010-04-27 19:38:55 UTC (rev 9613)
@@ -30,13 +30,13 @@
 	if ($rowwm = db_fetch_array($reswm)) {
 	  $webmaster = $rowwm['user_name']."@".forge_get_config('users_host')." (".$rowwm['realname'].")";
 	} else {
-	  $webmaster = $GLOBALS['sys_admin_email'];
+	  $webmaster = forge_get_config('admin_email');
 	}
 } else {
 	$title = "";
 	$link = "/new/";
 	$description = "";
-	$webmaster = $GLOBALS['sys_admin_email'];
+	$webmaster = forge_get_config('admin_email');
 }
 
 // ## one time output

Modified: trunk/gforge/www/export/rss20_news.php
===================================================================
--- trunk/gforge/www/export/rss20_news.php	2010-04-27 19:32:48 UTC (rev 9612)
+++ trunk/gforge/www/export/rss20_news.php	2010-04-27 19:38:55 UTC (rev 9613)
@@ -31,13 +31,13 @@
 	if ($rowwm = db_fetch_array($reswm)) {
 	  $webmaster = $rowwm['user_name']."@".forge_get_config('users_host')." (".$rowwm['realname'].")";
 	} else {
-	  $webmaster = $GLOBALS['sys_admin_email'];
+	  $webmaster = forge_get_config('admin_email');
 	}
 } else {
 	$title = "";
 	$link = "";
 	$description = "";
-	$webmaster = $GLOBALS['sys_admin_email'];
+	$webmaster = forge_get_config('admin_email');
 }
 
 $rssTitle = forge_get_config ('forge_name')." Project$title News";

Modified: trunk/gforge/www/export/rss20_tasks.php
===================================================================
--- trunk/gforge/www/export/rss20_tasks.php	2010-04-27 19:32:48 UTC (rev 9612)
+++ trunk/gforge/www/export/rss20_tasks.php	2010-04-27 19:38:55 UTC (rev 9613)
@@ -223,7 +223,7 @@
 
 
 function beginTaskFeed($feed_title, $feed_link, $feed_desc) {
-	global  $sys_admin_email;
+
 	header("Content-Type: text/xml");
 	print "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
 	print "<rss version=\"2.0\">\n";
@@ -233,7 +233,7 @@
 	print "  <description>".$feed_desc."</description>\n";
 	print "  <language>en-us</language>\n";
 	print "  <copyright>Copyright 2000-".date("Y")." ".forge_get_config('forge_name')."</copyright>\n";
-	print "  <webMaster>".$sys_admin_email."</webMaster>\n";
+	print "  <webMaster>".forge_get_config('admin_email')."</webMaster>\n";
 	print "  <lastBuildDate>".gmdate('D, d M Y G:i:s',time())." GMT</lastBuildDate>\n";
 	print "  <docs>http://blogs.law.harvard.edu/tech/rss</docs>\n";
 	print "  <image>\n";

Modified: trunk/gforge/www/export/rss20_tracker.php
===================================================================
--- trunk/gforge/www/export/rss20_tracker.php	2010-04-27 19:32:48 UTC (rev 9612)
+++ trunk/gforge/www/export/rss20_tracker.php	2010-04-27 19:38:55 UTC (rev 9613)
@@ -59,7 +59,7 @@
 
 //**************************************************************++
 function beginFeed($groupname = "", $link = "") {
-	global  $sys_admin_email;
+
 	header("Content-Type: text/xml");
 	print '<?xml version="1.0" encoding="UTF-8"?>
 			<rss version="2.0">
@@ -70,7 +70,7 @@
 	print "  <description>".forge_get_config('forge_name')." Bug Trackers of \"".$groupname."\"</description>\n";
 	print "  <language>en-us</language>\n";
 	print "  <copyright>Copyright 2000-".date("Y")." ".forge_get_config('forge_name')."</copyright>\n";
-	print "  <webMaster>".$sys_admin_email."</webMaster>\n";
+	print "  <webMaster>".forge_get_config('admin_email')."</webMaster>\n";
 	print "  <lastBuildDate>".gmdate('D, d M Y G:i:s',time())." GMT</lastBuildDate>\n";
 	print "  <docs>http://blogs.law.harvard.edu/tech/rss</docs>\n";
 	print "  <image>\n";

Modified: trunk/gforge/www/export/rss_sfnewreleases.php
===================================================================
--- trunk/gforge/www/export/rss_sfnewreleases.php	2010-04-27 19:32:48 UTC (rev 9612)
+++ trunk/gforge/www/export/rss_sfnewreleases.php	2010-04-27 19:38:55 UTC (rev 9613)
@@ -53,7 +53,7 @@
 print "  <description>".forge_get_config ('forge_name')." New Releases</description>\n";
 print "  <link>http://".forge_get_config('web_host')."</link>\n";
 print "  <title>".forge_get_config ('forge_name')." New Releases</title>\n";
-print "  <webMaster>".$GLOBALS['sys_admin_email']."</webMaster>\n";
+print "  <webMaster>".forge_get_config('admin_email')."</webMaster>\n";
 print "  <language>en-us</language>\n";
 // ## item outputs
 $outputtotal = 0;

Modified: trunk/gforge/www/search/include/renderers/ProjectRssSearchRenderer.class.php
===================================================================
--- trunk/gforge/www/search/include/renderers/ProjectRssSearchRenderer.class.php	2010-04-27 19:32:48 UTC (rev 9612)
+++ trunk/gforge/www/search/include/renderers/ProjectRssSearchRenderer.class.php	2010-04-27 19:38:55 UTC (rev 9613)
@@ -20,12 +20,12 @@
  * @return string additionnal information added in the RSS document
  */
 function rssProjectCallback($dataRow) {
-	// $default_trove_cat defined in local.inc
+	// forge_get_config('default_trove_cat') defined in local.inc
 	$result = db_query_params ('SELECT trove_cat.fullpath FROM trove_group_link, trove_cat
 WHERE trove_group_link.trove_cat_root=$1
 AND trove_group_link.trove_cat_id=trove_cat.trove_cat_id
 AND group_id=$2',
-				   array ($GLOBALS['default_trove_cat'],
+				   array (forge_get_config('default_trove_cat'),
 					  $dataRow['group_id'])) ;
 	$return = '';
 	$return .= ' | date registered: '.date('M jS Y', $dataRow['register_time']);

Modified: trunk/gforge/www/softwaremap/trove_list.php
===================================================================
--- trunk/gforge/www/softwaremap/trove_list.php	2010-04-27 19:32:48 UTC (rev 9612)
+++ trunk/gforge/www/softwaremap/trove_list.php	2010-04-27 19:38:55 UTC (rev 9613)
@@ -42,7 +42,7 @@
 
 // assign default. 18 is 'topic'
 if (!$form_cat) {
-	$form_cat = $default_trove_cat;
+	$form_cat = forge_get_config('default_trove_cat');
 }
 
 // get info about current folder

Modified: trunk/gforge/www/source.php
===================================================================
--- trunk/gforge/www/source.php	2010-04-27 19:32:48 UTC (rev 9612)
+++ trunk/gforge/www/source.php	2010-04-27 19:38:55 UTC (rev 9613)
@@ -12,8 +12,8 @@
 require_once('env.inc.php');
 require_once $gfwww.'include/pre.php';
 
-global $sys_show_source;
-if (!$sys_show_source) {
+
+if (!forge_get_config('show_source')) {
 	exit_permission_denied();
 }
 

Modified: trunk/gforge/www/themes/gforge-simple-theme/Theme.class.php
===================================================================
--- trunk/gforge/www/themes/gforge-simple-theme/Theme.class.php	2010-04-27 19:32:48 UTC (rev 9612)
+++ trunk/gforge/www/themes/gforge-simple-theme/Theme.class.php	2010-04-27 19:38:55 UTC (rev 9613)
@@ -202,8 +202,8 @@
 	border="0" /></a>
 </div>
 <?php
-global $sys_show_source;
-if ($sys_show_source) {
+
+if (forge_get_config('show_source')) {
 	echo util_make_link ('/source.php?file='.getStringFromServer('SCRIPT_NAME'),_('Show source'),array('class'=>'showsource'));
 }
 ?>

Modified: trunk/gforge/www/themes/ultralite/Theme.class.php
===================================================================
--- trunk/gforge/www/themes/ultralite/Theme.class.php	2010-04-27 19:32:48 UTC (rev 9612)
+++ trunk/gforge/www/themes/ultralite/Theme.class.php	2010-04-27 19:38:55 UTC (rev 9613)
@@ -145,8 +145,8 @@
 		<a href="http://fusionforge.org/">Powered By FusionForge</a><br />
 		</div>
 <?php		
-		global $sys_show_source;
-		if ($sys_show_source) {
+
+		if (forge_get_config('show_source')) {
 			echo util_make_link ('/source.php?file='.getStringFromServer('SCRIPT_NAME'),_('Show Source'),array('class'=>'showsource'));
 		}
 		?>

Modified: trunk/gforge/www/trove/index.php
===================================================================
--- trunk/gforge/www/trove/index.php	2010-04-27 19:32:48 UTC (rev 9612)
+++ trunk/gforge/www/trove/index.php	2010-04-27 19:38:55 UTC (rev 9613)
@@ -26,7 +26,7 @@
 
 // assign default if not defined
 if (!$categoryId) {
-	$categoryId = $default_trove_cat;
+	$categoryId = forge_get_config('default_trove_cat');
 }
 
 $category = new TroveCategory($categoryId);

Modified: trunk/tests/code/deprecations/DeprecationsTest.php
===================================================================
--- trunk/tests/code/deprecations/DeprecationsTest.php	2010-04-27 19:32:48 UTC (rev 9612)
+++ trunk/tests/code/deprecations/DeprecationsTest.php	2010-04-27 19:38:55 UTC (rev 9613)
@@ -107,6 +107,10 @@
 			       'sys_urlprefix',
 			       'sys_images_url',
 			       'sys_images_secure_url',
+			       'sys_admin_email',
+			       'sys_session_key',
+			       'sys_show_source',
+			       'default_trove_cat',
 			) ;
 
 		$pattern = implode ('|', $vars) ;




More information about the Fusionforge-commits mailing list