[evolvis-commits] r18016: update to tip of integration branch

mirabilos at evolvis.org mirabilos at evolvis.org
Tue Jan 17 10:28:39 CET 2012


Author: mirabilos
Date: 2012-01-17 10:28:39 +0100 (Tue, 17 Jan 2012)
New Revision: 18016

Modified:
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/changelog
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/etc/templates/local.pl
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/utils/include.pl
Log:
update to tip of integration branch

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/changelog
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/changelog	2012-01-17 09:14:14 UTC (rev 18015)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/changelog	2012-01-17 09:28:39 UTC (rev 18016)
@@ -1,4 +1,4 @@
-fusionforge (5.1.1+evolvis7) unstable; urgency=low
+fusionforge (5.1.1+evolvis7.1) unstable; urgency=low
 
   [ Mike Esser ]
   * Advanced Search: fix Status, add Summary fields, fix sorting
@@ -38,7 +38,7 @@
   * Unbreak interwiki; add database convergence (depends BSD::arc4random)
   * Make session cookies HttpOnly (raise PHP dependency to 5.2)
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Tue, 17 Jan 2012 09:59:37 +0100
+ -- Thorsten Glaser <t.glaser at tarent.de>  Tue, 17 Jan 2012 10:27:33 +0100
 
 fusionforge (5.1.1+evolvis6) unstable; urgency=low
 

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/etc/templates/local.pl
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/etc/templates/local.pl	2012-01-17 09:14:14 UTC (rev 18015)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/etc/templates/local.pl	2012-01-17 09:28:39 UTC (rev 18016)
@@ -35,6 +35,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');
 
 $noreply_to_bitbucket = '{noreply_to_bitbucket}' ;
 $sys_ip_address = '{ip_address}';

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/utils/include.pl
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/utils/include.pl	2012-01-17 09:14:14 UTC (rev 18015)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/utils/include.pl	2012-01-17 09:28:39 UTC (rev 18016)
@@ -102,3 +102,24 @@
 		    " in function " . $call_details[3] . "\n";
 	}
 }
+
+#############################
+# Compatibility functions.
+#############################
+sub util_make_url {
+	my ($path) = @_;
+	my $url;
+
+	if (($sys_use_ssl eq 'true') || ($sys_use_ssl eq '1')) {
+		$url = 'https://';
+	} else {
+		$url = 'http://';
+	}
+
+	$url .= $sys_default_domain . $sys_urlprefix;
+	$url =~ s,/$,,;
+	$path =~ s,^/,,;
+	$url .= '/' . $path;
+
+	return $url;
+}



More information about the evolvis-commits mailing list