[icinga-checkins] icinga.org: icingaweb2/master: Fix ICINGAWEB_APPDIR location if the Icinga library is in PHP' s include path

git at icinga.org git at icinga.org
Wed Nov 12 13:41:51 CET 2014


Module: icingaweb2
Branch: master
Commit: 8c9465ffbd5565dde988e889cc13676485768d99
URL:    https://git.icinga.org/?p=icingaweb2.git;a=commit;h=8c9465ffbd5565dde988e889cc13676485768d99

Author: Eric Lippmann <eric.lippmann at netways.de>
Date:   Tue Nov 11 15:30:11 2014 +0100

Fix ICINGAWEB_APPDIR location if the Icinga library is in PHP's include path

---

 library/Icinga/Application/ApplicationBootstrap.php |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
index 52d0e77..29e545c 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -6,6 +6,7 @@ namespace Icinga\Application;
 
 use ErrorException;
 use Exception;
+use LogicException;
 use Icinga\Application\Modules\Manager as ModuleManager;
 use Icinga\Data\ResourceFactory;
 use Icinga\Exception\ConfigurationError;
@@ -104,13 +105,15 @@ abstract class ApplicationBootstrap
 
         if (defined('ICINGAWEB_APPDIR')) {
             $this->appDir = ICINGAWEB_APPDIR;
-        } elseif (array_key_exists('ICINGAWEB_APPDIR', $_SERVER)) {
-            $this->appDir = $_SERVER['ICINGAWEB_APPDIR'];
         } else {
-            $this->appDir = realpath($this->libDir. '/../application');
-        }
-
-        if (!defined('ICINGAWEB_APPDIR')) {
+            if (array_key_exists('ICINGAWEB_APPDIR', $_SERVER)) {
+                $this->appDIr = $_SERVER['ICINGAWEB_APPDIR'];
+            } else {
+                if (! defined('ICINGAWEB_BASEDIR')) {
+                    throw new LogicException('\'ICINGAWEB_BASEDIR\' is not defined');
+                }
+                $this->appDir = ICINGAWEB_BASEDIR . '/application';
+            }
             define('ICINGAWEB_APPDIR', $this->appDir);
         }
 
@@ -394,7 +397,7 @@ abstract class ApplicationBootstrap
      */
     protected function setupLogger()
     {
-        if (($loggingConfig = $this->config->get('logging')) !== null) {
+        if (($loggingConfig = $this->config->logging) !== null) {
             try {
                 Logger::create($loggingConfig);
             } catch (ConfigurationError $e) {



More information about the icinga-checkins mailing list