Ticket #4299: hostname_3.patch

/var/www/html/admin/views/freepbx.php

@@ -155 +155 @@
-  echo "\t\t<div id=\"version\">";
-  $version = get_framework_version();
-  $version = $version ? $version : getversion();
+  $server_hostname = '';
+  if($amp_conf['HOSTNAMEINSTEADOFSERVERNAME']){
+    if (isset($_SESSION['session_hostname'])){  
+      $server_hostname = $_SESSION['session_hostname'];
+    }else{
+      if (function_exists(gethostname)){
+        $server_hostname = trim(gethostname());
+      }else{
+        $server_hostname = trim(php_uname('n'));
+      }
+      if ($server_hostname != ''){
+        $server_hostname = ' (' . substr($server_hostname, 0, 30) . ')';
+      }
+      $_SESSION['session_hostname'] = $server_hostname;
+    }
+  }else{
+    $server_hostname = $_SERVER['SERVER_NAME'];
+  }
-  echo sprintf(_("%s %s on %s"), 
-    //TODO : make this go somewhere more useful? or no link?
-    "<a href=\"http://www.freepbx.org\" target=\"_blank\">"._("FreePBX")."</a>",
-    $version,
-"<a href=\"http".(isset($_SERVER['HTTPS'])&&$_SERVER['HTTPS']!=''?'s':'')."://".$_SERVER['HTTP_HOST']."\">".$_SERVER["SERVER_NAME"]."</a>"
+'<a href="http'.(isset($_SERVER['HTTPS'])&&$_SERVER['HTTPS']!=''?'s':'').'://'.$_SERVER['HTTP_HOST'].'">'.$server_hostname.'</a>'
-     );
-  echo "</div>\n";
-

/var/www/html/admin/functions.inc.php

@@ -752 +752 @@
-  'USEQUEUESTATE'   => array('bool' , false),
-  'CHECKREFERER'    => array('bool' , true),
-  'USEDIALONE'    => array('bool' , false),
+  'HOSTNAMEINSTEADOFSERVERNAME' => array('bool' , false),
-);
-
-function parse_amportal_conf($filename) {