Merge branch 'feature/last-steps-for-composer-integration'

Author: following5

composer.json

@@ -0,0 +1,11 @@
+{
+    "name": "opencaching/okapi",
+    "require": {
+        "php": ">=5.6.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "okapi\\": "okapi/"
+        }
+    }
+}

okapi/Facade.php

@@ -40,14 +40,6 @@
 
 # --------------------
 
-#
-# TETODO: We should probably get to the point at which this can be removed.
-#
-
-if (!in_array($GLOBALS['rootpath'], explode(PATH_SEPARATOR, get_include_path()))) {
-    set_include_path(get_include_path().PATH_SEPARATOR.$GLOBALS['rootpath']);
-}
-
 require_once __DIR__ . '/autoload.php';
 OkapiErrorHandler::$treat_notices_as_errors = true;
 Okapi::init_internals();

okapi/Settings.php

@@ -235,7 +235,11 @@ private static function load_settings()
             # We have to temporarily disable our default error handler.
 
             OkapiErrorHandler::disable();
-            require_once __DIR__ . '/../okapi_settings.php';
+            $okapiSettings = __DIR__ . '/../okapi_settings.php';
+            if (!file_exists($okapiSettings)) {
+                $okapiSettings = __DIR__ . '/../../../../okapi_settings.php';
+            }
+            require_once $okapiSettings;
             $ref = get_okapi_settings();
             OkapiErrorHandler::reenable();
 
@@ -328,7 +332,7 @@ public static function default_gettext_init($langprefs)
         putenv("LC_ALL=$locale");
         setlocale(LC_ALL, $locale);
         setlocale(LC_NUMERIC, "POSIX"); # We don't want *this one* to get out of control.
-        bindtextdomain("okapi_messages", $GLOBALS['rootpath'].'okapi/locale');
+        bindtextdomain("okapi_messages", __DIR__ . '/locale');
         return $locale;
     }
 

okapi/core/OkapiServiceRunner.php

@@ -96,7 +96,7 @@ public static function docs($service_name)
             throw new \Exception();
         }
         try {
-            return file_get_contents("$service_name/docs.xml", true);
+            return file_get_contents(__DIR__.'/../'.$service_name. '/docs.xml', true);
         } catch (\Exception $e) {
             throw new \Exception("Missing documentation file: $service_name.xml");
         }

okapi/index.php

@@ -22,7 +22,10 @@
 use okapi\core\Okapi;
 use okapi\core\OkapiErrorHandler;
 
-$GLOBALS['rootpath'] = __DIR__.'/../';
+# When deployed via composer, the rootpath is already set.
+if (!isset($GLOBALS['rootpath'])) {
+    $GLOBALS['rootpath'] = __DIR__.'/../';
+}
 
 require_once __DIR__ . '/autoload.php';
 

okapi/services/apiref/method_index/WebService.php

@@ -71,7 +71,7 @@ private static function generateCacheKey() {
 
             return (
                 "api_ref/method_index#dev#".
-                self::getDirModDateRecursive($GLOBALS['rootpath']."okapi/services")
+                self::getDirModDateRecursive(__DIR__. '/../../../../okapi/services')
             );
         }
     }

okapi/services/attrs/AttrHelper.php

@@ -42,7 +42,7 @@ public static function refresh_now()
     {
         try
         {
-            $path = $GLOBALS['rootpath']."okapi/services/attrs/attribute-definitions.xml";
+            $path = __DIR__ . '/../../../okapi/services/attrs/attribute-definitions.xml';
             $xml = file_get_contents($path);
             self::refresh_from_string($xml);
         }

okapi/services/caches/map/TileRenderer.php

@@ -126,7 +126,7 @@ private static function get_image($name, $opacity=1, $brightness=0,
             {
                 # Miss again (or error decoding). Read the image from PNG.
 
-                $locmem_cache[$key] = imagecreatefrompng($GLOBALS['rootpath']."okapi/static/tilemap/$name.png");
+                $locmem_cache[$key] = imagecreatefrompng(__DIR__."/../../../../okapi/static/tilemap/$name.png");
 
                 # Apply all wanted effects.
 
@@ -357,7 +357,7 @@ private function get_caption($cache_id, $name_crc)
             # Split the name into a couple of lines.
 
             //$font = $GLOBALS['rootpath'].'util.sec/bt.ttf';
-            $font = $GLOBALS['rootpath'].'okapi/static/tilemap/tahoma.ttf';
+            $font = __DIR__.'/../../../../okapi/static/tilemap/tahoma.ttf';
             $size = 25;
             $lines = explode("\n", self::wordwrap($font, $size, 64*4 - 6*2, $name));
 

okapi/services/logs/submit/WebService.php

@@ -312,11 +312,9 @@ private static function _call(OkapiRequest $request)
             # NOTICE: We are including EXTERNAL OCDE libraries here! This
             # code does not belong to OKAPI!
 
-            if (Settings::get('OC_BRANCH') == 'oc.de')
+            if (Settings::get('OC_BRANCH') === 'oc.de')
             {
-                $opt['rootpath'] = $GLOBALS['rootpath'];
                 $opt['html_purifier'] = Settings::get('OCDE_HTML_PURIFIER_SETTINGS');
-                require_once $GLOBALS['rootpath'] . 'lib2/OcHTMLPurifier.class.php';
 
                 $purifier = new \OcHTMLPurifier($opt);
                 $formatted_comment = $purifier->purify($formatted_comment);