[evolvis-commits] r18343: [#2969] fix several old-vs-new configuration variable issues:

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Apr 12 14:16:29 CEST 2012


Author: mirabilos
Date: 2012-04-12 14:16:28 +0200 (Thu, 12 Apr 2012)
New Revision: 18343

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/deb-specific/create-mailing-lists.pl
   trunk/gforge_base/evolvisforge-5.1/src/utils/include.pl
   trunk/gforge_base/evolvisforge-5.1/src/www/export/rss_utils.inc
Log:
[#2969] fix several old-vs-new configuration variable issues:

• use vars is a weird beast
• copy two from local.pl to include.pl
• another user of an old global bites the dust

Modified: trunk/gforge_base/evolvisforge-5.1/src/deb-specific/create-mailing-lists.pl
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/deb-specific/create-mailing-lists.pl	2012-04-12 10:56:28 UTC (rev 18342)
+++ trunk/gforge_base/evolvisforge-5.1/src/deb-specific/create-mailing-lists.pl	2012-04-12 12:16:28 UTC (rev 18343)
@@ -11,6 +11,7 @@
 use File::Temp qw/ :mktemp  /;
 
 use vars qw/ $dbh $sys_lists_host $sys_users_host / ;
+use vars qw/ $sys_default_domain /;
 
 use vars qw// ;
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/utils/include.pl
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/utils/include.pl	2012-04-12 10:56:28 UTC (rev 18342)
+++ trunk/gforge_base/evolvisforge-5.1/src/utils/include.pl	2012-04-12 12:16:28 UTC (rev 18343)
@@ -57,6 +57,8 @@
 $homedir_prefix = &forge_get_config ('homedir_prefix') ;
 $grpdir_prefix = &forge_get_config ('groupdir_prefix') ;
 $file_dir = &forge_get_config ('data_path') ;
+$sys_use_ssl = &forge_get_config('use_ssl');
+$sys_urlprefix = &forge_get_config('url_prefix');
 
 ##############################
 # Database Connect Functions

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/export/rss_utils.inc
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/export/rss_utils.inc	2012-04-12 10:56:28 UTC (rev 18342)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/export/rss_utils.inc	2012-04-12 12:16:28 UTC (rev 18343)
@@ -47,7 +47,7 @@
 	print "  <copyright>Copyright ".date("Y")." ".forge_get_config ('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";
+	print "  <link>http://".forge_get_config('web_host')."/</link>\n";
 	print "  <title>$title</title>\n";
 	print "  <webMaster>".$GLOBALS['sys_admin_email']."</webMaster>\n";
 	print "  <language>en-us</language>\n";



More information about the evolvis-commits mailing list