[Fusionforge-commits] r15913 - branches/Branch_5_2/src/common/mail

Thorsten Glaser mirabilos at fusionforge.org
Mon Jul 2 17:19:15 CEST 2012


Author: mirabilos
Date: 2012-07-02 17:19:14 +0200 (Mon, 02 Jul 2012)
New Revision: 15913

Modified:
   branches/Branch_5_2/src/common/mail/MailingList.class.php
Log:
obergix said I should improve ?\226?\128?\153em all ?\226?\152?\186


Modified: branches/Branch_5_2/src/common/mail/MailingList.class.php
===================================================================
--- branches/Branch_5_2/src/common/mail/MailingList.class.php	2012-07-02 14:54:18 UTC (rev 15912)
+++ branches/Branch_5_2/src/common/mail/MailingList.class.php	2012-07-02 15:19:14 UTC (rev 15913)
@@ -342,15 +342,11 @@
 	 * @return string url of the archives
 	 */
 	function getArchivesUrl() {
-		if (forge_get_config('use_ssl')) {
-			$proto = 'https';
-		} else {
-			$proto = 'http';
-		}
+		$host = util_url_prefix() . forge_get_config('lists_host');
 		if ($this->isPublic()) {
-			return "$proto://".forge_get_config('lists_host').'/pipermail/'.$this->getName().'/';
+			return $host . '/pipermail/' . $this->getName() . '/';
 		} else {
-			return "$proto://".forge_get_config('lists_host').'/mailman/private/'.$this->getName().'/';
+			return $host . '/mailman/private/' . $this->getName() . '/';
 		}
 	}
 
@@ -360,12 +356,8 @@
 	 * @return string url of the info page
 	 */
 	function getExternalInfoUrl() {
-		if (forge_get_config('use_ssl')) {
-			$proto = 'https';
-		} else {
-			$proto = 'http';
-		}
-		return "$proto://".forge_get_config('lists_host').'/mailman/listinfo/'.$this->getName();
+		return util_url_prefix() . forge_get_config('lists_host') .
+		    '/mailman/listinfo/' . $this->getName();
 	}
 
 	/**
@@ -374,12 +366,8 @@
 	 * @return string url of the admin
 	 */
 	function getExternalAdminUrl() {
-		if (forge_get_config('use_ssl')) {
-			$proto = 'https';
-		} else {
-			$proto = 'http';
-		}
-		return "$proto://".forge_get_config('lists_host').'/mailman/admin/'.$this->getName();
+		return util_url_prefix() . forge_get_config('lists_host') .
+		    '/mailman/admin/' . $this->getName();
 	}
 
 	/**




More information about the Fusionforge-commits mailing list