Merged revisions 3100-3175 from stable branch.

tbrehm

2012-06-07 26c0fc98b880cf148ab348aefef85ac9b087597c

 interface/lib/classes/functions.inc.php

@@ -101,7 +101,7 @@
   }
   
   public function get_ispconfig_url() {
      $url = (stristr($_SERVER['SERVER_PROTOCOL'],'HTTPS'))?'https':'http';
      $url = (stristr($_SERVER['SERVER_PROTOCOL'],'HTTPS') || stristr($_SERVER['HTTPS'],'on'))?'https':'http';
      $url .= '://'.$_SERVER['SERVER_NAME'];
      if($_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) {
         $url .= ':'.$_SERVER['SERVER_PORT'];