Merged revision 2280 from stable branch.

tbrehm · tbrehm · commit d84fa49820fb · 2011-04-06T08:08:30.000Z
diff --git a/interface/lib/classes/functions.inc.php b/interface/lib/classes/functions.inc.php
@@ -96,6 +96,14 @@ public function currency_format($number) {
 		return number_format((double)$number, $number_format_decimals, $number_format_dec_point, $number_format_thousands_sep);
 	}
 	
+	public function get_ispconfig_url() {
+		$url = (stristr($_SERVER['SERVER_PROTOCOL'],'HTTPS'))?'https':'http';
+		$url .= '://'.$_SERVER['SERVER_NAME'];
+		if($_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) {
+			$url .= ':'.$_SERVER['SERVER_PORT'];
+		}
+		return $url;
+	}
 	
 		
 }

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,14 @@ public function currency_format($number) {`
`96`	`96`	`return number_format((double)$number, $number_format_decimals, $number_format_dec_point, $number_format_thousands_sep);`
`97`	`97`	`}`
`98`	`98`
	`99`	`+ public function get_ispconfig_url() {`
	`100`	`+ $url = (stristr($_SERVER['SERVER_PROTOCOL'],'HTTPS'))?'https':'http';`
	`101`	`+ $url .= '://'.$_SERVER['SERVER_NAME'];`
	`102`	`+ if($_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) {`
	`103`	`+ $url .= ':'.$_SERVER['SERVER_PORT'];`
	`104`	`+ }`
	`105`	`+ return $url;`
	`106`	`+ }`
`99`	`107`
`100`	`108`
`101`	`109`	`}`