redoing the change concerning the hostname.

diff --git a/include/cli_startup.php b/include/cli_startup.php
index 236fd14427b3a4d608b14922fdf714e4755c457e..d43bc1c947b4a70ebc591c0151e0260bccdfea7a 100644 (file)
--- a/include/cli_startup.php
+++ b/include/cli_startup.php
@@ -24,9 +24,6 @@ function cli_startup() {
        load_config('config');
        load_config('system');
 
-       if ($hostname =  get_config('system', 'hostname'))
-               $a->set_hostname($hostname);
-
        $a->set_baseurl(get_config('system','url'));
 
        load_hooks();

diff --git a/include/notifier.php b/include/notifier.php
index a90e180623ace698fbc12737fa00e3b78eca1bea..a3286355ddabb371578c990abbae967dda6764de 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -65,9 +65,6 @@ function notifier_run(&$argv, &$argc){
        load_config('config');
        load_config('system');
 
-       if ($hostname =  get_config('system', 'hostname'))
-               $a->set_hostname($hostname);
-
        load_hooks();
 
        if($argc < 3)

diff --git a/include/onepoll.php b/include/onepoll.php
index 737f70a28673701831c5dcf5390d3760f06b05f7..f38f6b4c61d88fbf54528267d3940e52f64530d5 100644 (file)
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -37,9 +37,6 @@ function onepoll_run(&$argv, &$argc){
        load_config('config');
        load_config('system');
 
-       if ($hostname =  get_config('system', 'hostname'))
-               $a->set_hostname($hostname);
-
        $a->set_baseurl(get_config('system','url'));
 
        load_hooks();

diff --git a/include/poller.php b/include/poller.php
index 0bbead189109062495c8640b9b9e0e9f3b1e8c6d..e927430ea9e7ef6ab2831a2b35869c85d7fb7503 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -30,9 +30,6 @@ function poller_run(&$argv, &$argc){
        load_config('config');
        load_config('system');
 
-       if ($hostname =  get_config('system', 'hostname'))
-               $a->set_hostname($hostname);
-
        $maxsysload = intval(get_config('system','maxloadavg'));
        if($maxsysload < 1)
                $maxsysload = 50;

diff --git a/include/queue.php b/include/queue.php
index f277b3fbd4ec4a8f08c4c1b2f1f53db07c128070..64cccad21efe4f796a50e39b480da75415da7d12 100644 (file)
--- a/include/queue.php
+++ b/include/queue.php
@@ -25,9 +25,6 @@ function queue_run(&$argv, &$argc){
        load_config('config');
        load_config('system');
 
-       if ($hostname =  get_config('system', 'hostname'))
-               $a->set_hostname($hostname);
-
        $a->set_baseurl(get_config('system','url'));
 
        load_hooks();

diff --git a/index.php b/index.php
index 67c0c495cf9316994d77926214bc7021da605786..6b6e873ea6b1987a20206b5bdcbabd2cdda9bccc 100644 (file)
--- a/index.php
+++ b/index.php
@@ -53,9 +53,6 @@ if(!$install) {
        load_config('config');
        load_config('system');
 
-       if ($hostname =  get_config('system', 'hostname'))
-               $a->set_hostname($hostname);
-
        require_once("include/session.php");
        load_hooks();
        call_hooks('init_1');