PhileCMS / Phile

lib/Phile/Core/Utility.php

Indentation +186 added lines, -186 removed lines

@@ -14,190 +14,190 @@
  */
 class Utility {
 
-	/**
-	 * method to get the current http protocol
-	 *
-	 * @return string the current protocol
-	 * @deprecated since 1.5 will be removed
-	 */
-	public static function getProtocol() {
-		return (new Router)->getProtocol();
-	}
-
-	/**
-	 * detect base url
-	 *
-	 * @return string
-	 * @deprecated since 1.5 will be removed
-	 */
-	public static function getBaseUrl() {
-		return (new Router)->getBaseUrl();
-	}
-
-	/**
-	 * detect install path
-	 *
-	 * @return string
-	 * @deprecated since 1.5 will be removed
-	 */
-	public static function getInstallPath() {
-		$path = self::getBaseUrl();
-		$path = substr($path, strpos($path, '://') + 3);
-		$path = substr($path, strpos($path, '/') + 1);
-
-		return $path;
-	}
-
-	/**
-	 * resolve a file path by replace the mod: prefix
-	 *
-	 * @param $path
-	 *
-	 * @return string|null the full filepath or null if file does not exists
-	 */
-	public static function resolveFilePath($path) {
-		// resolve MOD: prefix
-		if (strtoupper(substr($path, 0, 3)) === 'MOD') {
-			$path = str_ireplace('mod:', PLUGINS_DIR, $path);
-		}
-		// check if file exists
-		if (file_exists($path)) {
-			return $path;
-		}
-
-		return null;
-	}
-
-	/**
-	 * load files e.g. config files
-	 *
-	 * @param $file
-	 *
-	 * @return mixed|null
-	 */
-	public static function load($file) {
-		if (file_exists($file)) {
-			return include $file;
-		}
-
-		return null;
-	}
-
-	/**
-	 * check if a plugin is loaded
-	 *
-	 * @param $plugin
-	 * @return bool
-	 * @deprecated since 1.5 will be removed
-	 * @use 'plugins_loaded' event
-	 */
-	public static function isPluginLoaded($plugin) {
-		$config = Registry::get('Phile_Settings');
-		return (isset($config['plugins'][$plugin]) && isset($config['plugins'][$plugin]['active']) && $config['plugins'][$plugin]['active'] === true);
-	}
-
-	/**
-	 * static method to get files by directory and file filter
-	 *
-	 * @param        $directory
-	 * @param string $filter
-	 *
-	 * @return array
-	 */
-	public static function getFiles($directory, $filter = '\Phile\FilterIterator\GeneralFileFilterIterator') {
-		$files = new $filter(
-			new \RecursiveIteratorIterator(
-				new \RecursiveDirectoryIterator(
-					$directory,
-					\RecursiveDirectoryIterator::FOLLOW_SYMLINKS
-				)
-			)
-		);
-		$result = array();
-		foreach ($files as $file) {
-			/** @var \SplFileInfo $file */
-			$result[] = $file->getPathname();
-		}
-
-		return $result;
-	}
-
-	/**
-	 * redirect to an url
-	 *
-	 * @param     $url        the url to redirect to
-	 * @param int $statusCode the http status code
-	 * @deprecated since 1.5 will be removed
-	 */
-	public static function redirect($url, $statusCode = 302) {
-		(new Response)->redirect($url, $statusCode);
-	}
-
-	/**
-	 * generate secure md5 hash
-	 *
-	 * @param $value
-	 *
-	 * @return string
-	 */
-	public static function getSecureMD5Hash($value) {
-		$config = Registry::get('Phile_Settings');
-
-		return md5($config['encryptionKey'] . $value);
-	}
-
-	/**
-	 * method to generate a secure token
-	 * code from http://stackoverflow.com/questions/1846202/php-how-to-generate-a-random-unique-alphanumeric-string/13733588#13733588
-	 * modified by Frank Nägler
-	 *
-	 * @param int  $length
-	 * @param bool $widthSpecialChars
-	 * @param null $additionalChars
-	 *
-	 * @return string
-	 */
-	public static function generateSecureToken($length = 32, $widthSpecialChars = true, $additionalChars = null) {
-		$token        = "";
-		$codeAlphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-		$codeAlphabet .= "abcdefghijklmnopqrstuvwxyz";
-		$codeAlphabet .= "0123456789";
-		if ($widthSpecialChars) {
-			$codeAlphabet .= "!/()=?[]|{}";
-		}
-		if ($additionalChars !== null) {
-			$codeAlphabet .= $additionalChars;
-		}
-		for ($i = 0; $i < $length; $i++) {
-			$token .= $codeAlphabet[Utility::crypto_rand_secure(0, strlen($codeAlphabet))];
-		}
-
-		return $token;
-	}
-
-	/**
-	 * method to get a more secure random value
-	 * code from http://stackoverflow.com/questions/1846202/php-how-to-generate-a-random-unique-alphanumeric-string/13733588#13733588
-	 *
-	 * @param $min
-	 * @param $max
-	 *
-	 * @return mixed
-	 */
-	public static function crypto_rand_secure($min, $max) {
-		$range = $max - $min;
-		if ($range < 0) {
-			return $min;
-		} // not so random...
-		$log    = log($range, 2);
-		$bytes  = (int)($log / 8) + 1; // length in bytes
-		$bits   = (int)$log + 1; // length in bits
-		$filter = (int)(1 << $bits) - 1; // set all lower bits to 1
-		do {
-			$rnd = hexdec(bin2hex(openssl_random_pseudo_bytes($bytes)));
-			$rnd = $rnd & $filter; // discard irrelevant bits
-		} while ($rnd >= $range);
-
-		return $min + $rnd;
-	}
+    /**
+     * method to get the current http protocol
+     *
+     * @return string the current protocol
+     * @deprecated since 1.5 will be removed
+     */
+    public static function getProtocol() {
+        return (new Router)->getProtocol();
+    }
+
+    /**
+     * detect base url
+     *
+     * @return string
+     * @deprecated since 1.5 will be removed
+     */
+    public static function getBaseUrl() {
+        return (new Router)->getBaseUrl();
+    }
+
+    /**
+     * detect install path
+     *
+     * @return string
+     * @deprecated since 1.5 will be removed
+     */
+    public static function getInstallPath() {
+        $path = self::getBaseUrl();
+        $path = substr($path, strpos($path, '://') + 3);
+        $path = substr($path, strpos($path, '/') + 1);
+
+        return $path;
+    }
+
+    /**
+     * resolve a file path by replace the mod: prefix
+     *
+     * @param $path
+     *
+     * @return string|null the full filepath or null if file does not exists
+     */
+    public static function resolveFilePath($path) {
+        // resolve MOD: prefix
+        if (strtoupper(substr($path, 0, 3)) === 'MOD') {
+            $path = str_ireplace('mod:', PLUGINS_DIR, $path);
+        }
+        // check if file exists
+        if (file_exists($path)) {
+            return $path;
+        }
+
+        return null;
+    }
+
+    /**
+     * load files e.g. config files
+     *
+     * @param $file
+     *
+     * @return mixed|null
+     */
+    public static function load($file) {
+        if (file_exists($file)) {
+            return include $file;
+        }
+
+        return null;
+    }
+
+    /**
+     * check if a plugin is loaded
+     *
+     * @param $plugin
+     * @return bool
+     * @deprecated since 1.5 will be removed
+     * @use 'plugins_loaded' event
+     */
+    public static function isPluginLoaded($plugin) {
+        $config = Registry::get('Phile_Settings');
+        return (isset($config['plugins'][$plugin]) && isset($config['plugins'][$plugin]['active']) && $config['plugins'][$plugin]['active'] === true);
+    }
+
+    /**
+     * static method to get files by directory and file filter
+     *
+     * @param        $directory
+     * @param string $filter
+     *
+     * @return array
+     */
+    public static function getFiles($directory, $filter = '\Phile\FilterIterator\GeneralFileFilterIterator') {
+        $files = new $filter(
+            new \RecursiveIteratorIterator(
+                new \RecursiveDirectoryIterator(
+                    $directory,
+                    \RecursiveDirectoryIterator::FOLLOW_SYMLINKS
+                )
+            )
+        );
+        $result = array();
+        foreach ($files as $file) {
+            /** @var \SplFileInfo $file */
+            $result[] = $file->getPathname();
+        }
+
+        return $result;
+    }
+
+    /**
+     * redirect to an url
+     *
+     * @param     $url        the url to redirect to
+     * @param int $statusCode the http status code
+     * @deprecated since 1.5 will be removed
+     */
+    public static function redirect($url, $statusCode = 302) {
+        (new Response)->redirect($url, $statusCode);
+    }
+
+    /**
+     * generate secure md5 hash
+     *
+     * @param $value
+     *
+     * @return string
+     */
+    public static function getSecureMD5Hash($value) {
+        $config = Registry::get('Phile_Settings');
+
+        return md5($config['encryptionKey'] . $value);
+    }
+
+    /**
+     * method to generate a secure token
+     * code from http://stackoverflow.com/questions/1846202/php-how-to-generate-a-random-unique-alphanumeric-string/13733588#13733588
+     * modified by Frank Nägler
+     *
+     * @param int  $length
+     * @param bool $widthSpecialChars
+     * @param null $additionalChars
+     *
+     * @return string
+     */
+    public static function generateSecureToken($length = 32, $widthSpecialChars = true, $additionalChars = null) {
+        $token        = "";
+        $codeAlphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+        $codeAlphabet .= "abcdefghijklmnopqrstuvwxyz";
+        $codeAlphabet .= "0123456789";
+        if ($widthSpecialChars) {
+            $codeAlphabet .= "!/()=?[]|{}";
+        }
+        if ($additionalChars !== null) {
+            $codeAlphabet .= $additionalChars;
+        }
+        for ($i = 0; $i < $length; $i++) {
+            $token .= $codeAlphabet[Utility::crypto_rand_secure(0, strlen($codeAlphabet))];
+        }
+
+        return $token;
+    }
+
+    /**
+     * method to get a more secure random value
+     * code from http://stackoverflow.com/questions/1846202/php-how-to-generate-a-random-unique-alphanumeric-string/13733588#13733588
+     *
+     * @param $min
+     * @param $max
+     *
+     * @return mixed
+     */
+    public static function crypto_rand_secure($min, $max) {
+        $range = $max - $min;
+        if ($range < 0) {
+            return $min;
+        } // not so random...
+        $log    = log($range, 2);
+        $bytes  = (int)($log / 8) + 1; // length in bytes
+        $bits   = (int)$log + 1; // length in bits
+        $filter = (int)(1 << $bits) - 1; // set all lower bits to 1
+        do {
+            $rnd = hexdec(bin2hex(openssl_random_pseudo_bytes($bytes)));
+            $rnd = $rnd & $filter; // discard irrelevant bits
+        } while ($rnd >= $range);
+
+        return $min + $rnd;
+    }
 }

lib/Phile/Core/Registry.php

Indentation +123 added lines, -123 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /**
- * Registry class
- */
+     * Registry class
+     */
 namespace Phile\Core;
 
 /**
@@ -13,137 +13,137 @@ 
  * @package Phile\Core
  */
 class Registry extends \ArrayObject {
-	/**
-	 * Registry object provides storage for shared objects.
-	 *
-	 * @var Registry
-	 */
-	private static $_registry = null;
+    /**
+     * Registry object provides storage for shared objects.
+     *
+     * @var Registry
+     */
+    private static $_registry = null;
 
-	/**
-	 * Retrieves the default registry instance.
-	 *
-	 * @return Registry
-	 */
-	public static function getInstance() {
-		if (self::$_registry === null) {
-			self::init();
-		}
+    /**
+     * Retrieves the default registry instance.
+     *
+     * @return Registry
+     */
+    public static function getInstance() {
+        if (self::$_registry === null) {
+            self::init();
+        }
 
-		return self::$_registry;
-	}
+        return self::$_registry;
+    }
 
-	/**
-	 * Set the default registry instance to a specified instance.
-	 *
-	 * @param Registry $registry An object instance of type Registry,
-	 *                           or a subclass.
-	 *
-	 * @param Registry $registry
-	 *
-	 * @throws \Exception
-	 */
-	public static function setInstance(Registry $registry) {
-		if (self::$_registry !== null) {
-			throw new \Exception('Registry is already initialized', 1398536572);
-		}
-		self::$_registry = $registry;
-	}
+    /**
+     * Set the default registry instance to a specified instance.
+     *
+     * @param Registry $registry An object instance of type Registry,
+     *                           or a subclass.
+     *
+     * @param Registry $registry
+     *
+     * @throws \Exception
+     */
+    public static function setInstance(Registry $registry) {
+        if (self::$_registry !== null) {
+            throw new \Exception('Registry is already initialized', 1398536572);
+        }
+        self::$_registry = $registry;
+    }
 
-	/**
-	 * Initialize the default registry instance.
-	 *
-	 * @return void
-	 */
-	protected static function init() {
-		self::setInstance(new Registry());
-	}
+    /**
+     * Initialize the default registry instance.
+     *
+     * @return void
+     */
+    protected static function init() {
+        self::setInstance(new Registry());
+    }
 
-	/**
-	 * Unset the default registry instance.
-	 * Primarily used in tearDown() in unit tests.
-	 *
-	 * @returns void
-	 */
-	public static function _unsetInstance() {
-		self::$_registry = null;
-	}
+    /**
+     * Unset the default registry instance.
+     * Primarily used in tearDown() in unit tests.
+     *
+     * @returns void
+     */
+    public static function _unsetInstance() {
+        self::$_registry = null;
+    }
 
-	/**
-	 * getter method, basically same as offsetGet().
-	 *
-	 * This method can be called from an object of type Registry, or it
-	 * can be called statically.  In the latter case, it uses the default
-	 * static instance stored in the class.
-	 *
-	 * @param string $index - get the value associated with $index
-	 *
-	 * @return mixed
-	 * @throws \Exception if no entry is registerd for $index.
-	 */
-	public static function get($index) {
-		$instance = self::getInstance();
-		if (!$instance->offsetExists($index)) {
-			throw new \Exception("No entry is registered for key '$index'", 1398536594);
-		}
+    /**
+     * getter method, basically same as offsetGet().
+     *
+     * This method can be called from an object of type Registry, or it
+     * can be called statically.  In the latter case, it uses the default
+     * static instance stored in the class.
+     *
+     * @param string $index - get the value associated with $index
+     *
+     * @return mixed
+     * @throws \Exception if no entry is registerd for $index.
+     */
+    public static function get($index) {
+        $instance = self::getInstance();
+        if (!$instance->offsetExists($index)) {
+            throw new \Exception("No entry is registered for key '$index'", 1398536594);
+        }
 
-		return $instance->offsetGet($index);
-	}
+        return $instance->offsetGet($index);
+    }
 
-	/**
-	 * setter method, basically same as offsetSet().
-	 *
-	 * This method can be called from an object of type Registry, or it
-	 * can be called statically.  In the latter case, it uses the default
-	 * static instance stored in the class.
-	 *
-	 * @param string $index The location in the ArrayObject in which to store
-	 *                      the value.
-	 * @param mixed  $value The object to store in the ArrayObject.
-	 *
-	 * @return void
-	 */
-	public static function set($index, $value) {
-		$instance = self::getInstance();
-		$instance->offsetSet($index, $value);
-	}
+    /**
+     * setter method, basically same as offsetSet().
+     *
+     * This method can be called from an object of type Registry, or it
+     * can be called statically.  In the latter case, it uses the default
+     * static instance stored in the class.
+     *
+     * @param string $index The location in the ArrayObject in which to store
+     *                      the value.
+     * @param mixed  $value The object to store in the ArrayObject.
+     *
+     * @return void
+     */
+    public static function set($index, $value) {
+        $instance = self::getInstance();
+        $instance->offsetSet($index, $value);
+    }
 
-	/**
-	 * Returns TRUE if the $index is a named value in the registry,
-	 * or FALSE if $index was not found in the registry.
-	 *
-	 * @param  string $index
-	 *
-	 * @return boolean
-	 */
-	public static function isRegistered($index) {
-		if (self::$_registry === null) {
-			return false;
-		}
+    /**
+     * Returns TRUE if the $index is a named value in the registry,
+     * or FALSE if $index was not found in the registry.
+     *
+     * @param  string $index
+     *
+     * @return boolean
+     */
+    public static function isRegistered($index) {
+        if (self::$_registry === null) {
+            return false;
+        }
 
-		return self::$_registry->offsetExists($index);
-	}
+        return self::$_registry->offsetExists($index);
+    }
 
-	/**
-	 * the constructor
-	 *
-	 * @param array   $array data array
-	 * @param integer $flags ArrayObject flags
-	 */
-	public function __construct($array = array(), $flags = parent::ARRAY_AS_PROPS) {
-		parent::__construct($array, $flags);
-	}
+    /**
+     * the constructor
+     *
+     * @param array   $array data array
+     * @param integer $flags ArrayObject flags
+     */
+    public function __construct($array = array(), $flags = parent::ARRAY_AS_PROPS) {
+        parent::__construct($array, $flags);
+    }
 
-	/**
-	 * method to check if offset exists
-	 *
-	 * @param string $index
-	 *
-	 * @returns mixed
-	 *
-	 * Workaround for http://bugs.php.net/bug.php?id=40442 (ZF-960).
-	 */
-	public function offsetExists($index) {
-		return array_key_exists($index, $this);
-	}
+    /**
+     * method to check if offset exists
+     *
+     * @param string $index
+     *
+     * @returns mixed
+     *
+     * Workaround for http://bugs.php.net/bug.php?id=40442 (ZF-960).
+     */
+    public function offsetExists($index) {
+        return array_key_exists($index, $this);
+    }
 }

lib/Phile/Core/Router.php

Indentation +136 added lines, -136 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /**
- * the Router class
- */
+     * the Router class
+     */
 
 namespace Phile\Core;
 
@@ -15,138 +15,138 @@ 
  */
 class Router {
 
-	/**
-	 * @var array with $_SERVER environment
-	 */
-	protected $server;
-
-	/**
-	 * @param array $server $_SERVER environment
-	 */
-	public function __construct(array $server = []) {
-		if (empty($server)) {
-			$server = $_SERVER;
-		}
-		$this->server = $server;
-	}
-
-	/**
-	 * get request-URL relative to Phile base-URL
-	 *
-	 * @return string relative URL e.g. `index`, `sub/`, `sub/page`
-	 */
-	public function getCurrentUrl() {
-		$url = $this->server['REQUEST_URI'];
-
-		// remove query string
-		$queryPosition = strpos($url, '?');
-		if ($queryPosition) {
-			$url = substr($url, 0, $queryPosition);
-		}
-
-		// resolve root-relative URL-path
-		$baseUrl = $this->getBaseUrl();
-		$basePath = $this->getUrlPath($baseUrl);
-		if (!empty($basePath) && strpos($url, $basePath) === 0) {
-			$url = substr($url, strlen($basePath));
-		}
-		$url = ltrim($url, '/');
-
-		$url = urldecode($url);
-
-		return $url;
-	}
-
-	/**
-	 * Get base-URL of the Phile installation
-	 *
-	 * @return string `scheme://host/path/phile-root`
-	 */
-	public function getBaseUrl() {
-		if (Registry::isRegistered('Phile_Settings')) {
-			$config = Registry::get('Phile_Settings');
-			if (!empty($config['base_url'])) {
-				return $config['base_url'];
-			}
-		}
-
-		$url = '';
-
-		if (isset($this->server['PHP_SELF'])) {
-			$url = preg_replace('/index\.php(.*)?$/', '', $this->server['PHP_SELF']);
-		}
-
-		if (isset($this->server['HTTP_HOST'])) {
-			$host = $this->server['HTTP_HOST'];
-			$protocol = $this->getProtocol();
-			$url = $protocol . '://' . $host . $url;
-		}
-
-		$url = rtrim($url, '/');
-		return $url;
-	}
-
-	/**
-	 * get the URL for a page-Id
-	 *
-	 * e.g. `sub/index` --> `http://host/phile-root/sub`
-	 *
-	 * @param string $pageId
-	 * @param bool $base return a full or root-relative URL
-	 * @return string URL
-	 */
-	public function urlForPage($pageId, $base = true) {
-		$url = $pageId;
-		if ($base) {
-			$url = $this->url($url);
-		}
-		return $url;
-	}
-
-	/**
-	 * converts Phile-root relative URL to full URL
-	 *
-	 * e.g. `foo/bar.ext` --> `http://host/phile-root/foo/bar.ext`
-	 *
-	 * @param string $url
-	 * @return string
-	 */
-	public function url($url) {
-		return $this->getBaseUrl() . '/' . ltrim($url, '/');
-	}
-
-	/**
-	 * get the HTTP-protocol
-	 *
-	 * @return string
-	 */
-	public function getProtocol() {
-		if (empty($this->server['HTTP_HOST'])) {
-			return null;
-		}
-		$protocol = 'http';
-		if (isset($this->server['HTTPS']) && strtolower($this->server['HTTPS']) !== 'off') {
-			$protocol = 'https';
-		}
-		return $protocol;
-	}
-
-	/**
-	 * get path of an URL
-	 *
-	 * `scheme://host/path/sub` --> `/path/sub`
-	 *
-	 * @param string $url
-	 * @return string
-	 */
-	protected function getUrlPath($url) {
-		$path = '';
-		if (strpos($url, '://') !== false) {
-			$parsed = parse_url($url);
-			if (isset($parsed['path'])) {
-				$path = $parsed['path'];
-			}
-		}
-		return $path;
-	}
+    /**
+     * @var array with $_SERVER environment
+     */
+    protected $server;
+
+    /**
+     * @param array $server $_SERVER environment
+     */
+    public function __construct(array $server = []) {
+        if (empty($server)) {
+            $server = $_SERVER;
+        }
+        $this->server = $server;
+    }
+
+    /**
+     * get request-URL relative to Phile base-URL
+     *
+     * @return string relative URL e.g. `index`, `sub/`, `sub/page`
+     */
+    public function getCurrentUrl() {
+        $url = $this->server['REQUEST_URI'];
+
+        // remove query string
+        $queryPosition = strpos($url, '?');
+        if ($queryPosition) {
+            $url = substr($url, 0, $queryPosition);
+        }
+
+        // resolve root-relative URL-path
+        $baseUrl = $this->getBaseUrl();
+        $basePath = $this->getUrlPath($baseUrl);
+        if (!empty($basePath) && strpos($url, $basePath) === 0) {
+            $url = substr($url, strlen($basePath));
+        }
+        $url = ltrim($url, '/');
+
+        $url = urldecode($url);
+
+        return $url;
+    }
+
+    /**
+     * Get base-URL of the Phile installation
+     *
+     * @return string `scheme://host/path/phile-root`
+     */
+    public function getBaseUrl() {
+        if (Registry::isRegistered('Phile_Settings')) {
+            $config = Registry::get('Phile_Settings');
+            if (!empty($config['base_url'])) {
+                return $config['base_url'];
+            }
+        }
+
+        $url = '';
+
+        if (isset($this->server['PHP_SELF'])) {
+            $url = preg_replace('/index\.php(.*)?$/', '', $this->server['PHP_SELF']);
+        }
+
+        if (isset($this->server['HTTP_HOST'])) {
+            $host = $this->server['HTTP_HOST'];
+            $protocol = $this->getProtocol();
+            $url = $protocol . '://' . $host . $url;
+        }
+
+        $url = rtrim($url, '/');
+        return $url;
+    }
+
+    /**
+     * get the URL for a page-Id
+     *
+     * e.g. `sub/index` --> `http://host/phile-root/sub`
+     *
+     * @param string $pageId
+     * @param bool $base return a full or root-relative URL
+     * @return string URL
+     */
+    public function urlForPage($pageId, $base = true) {
+        $url = $pageId;
+        if ($base) {
+            $url = $this->url($url);
+        }
+        return $url;
+    }
+
+    /**
+     * converts Phile-root relative URL to full URL
+     *
+     * e.g. `foo/bar.ext` --> `http://host/phile-root/foo/bar.ext`
+     *
+     * @param string $url
+     * @return string
+     */
+    public function url($url) {
+        return $this->getBaseUrl() . '/' . ltrim($url, '/');
+    }
+
+    /**
+     * get the HTTP-protocol
+     *
+     * @return string
+     */
+    public function getProtocol() {
+        if (empty($this->server['HTTP_HOST'])) {
+            return null;
+        }
+        $protocol = 'http';
+        if (isset($this->server['HTTPS']) && strtolower($this->server['HTTPS']) !== 'off') {
+            $protocol = 'https';
+        }
+        return $protocol;
+    }
+
+    /**
+     * get path of an URL
+     *
+     * `scheme://host/path/sub` --> `/path/sub`
+     *
+     * @param string $url
+     * @return string
+     */
+    protected function getUrlPath($url) {
+        $path = '';
+        if (strpos($url, '://') !== false) {
+            $parsed = parse_url($url);
+            if (isset($parsed['path'])) {
+                $path = $parsed['path'];
+            }
+        }
+        return $path;
+    }
 }

lib/Phile/Core/Response.php

Indentation +113 added lines, -113 removed lines

@@ -22,119 +22,119 @@
  */
 class Response {
 
-	/**
-	 * @var string HTTP body
-	 */
-	protected $body = '';
-
-	/**
-	 * @var string charset
-	 */
-	protected $charset = 'utf-8';
-
-	/**
-	 * @var array HTTP-headers
-	 */
-	protected $headers = [];
-
-	/**
-	 * @var int HTTP status code
-	 */
-	protected $statusCode = 200;
-
-	/**
-	 * redirect to another URL
-	 *
-	 * @param string $url URL
-	 * @param int $statusCode
-	 */
-	public function redirect($url, $statusCode = 302) {
-		$this->setStatusCode($statusCode)
-			->setHeader('Location', $url, true)
-			->setBody('')
-			->send()
-			->stop();
-	}
-
-	/**
-	 * set the response body
-	 *
-	 * @param $body
-	 * @return $this
-	 */
-	public function setBody($body) {
-		$this->body = $body;
-		return $this;
-	}
-
-	/**
-	 * set the response character-set
-	 *
-	 * @param $charset
-	 * @return $this
-	 */
-	public function setCharset($charset) {
-		$this->charset = $charset;
-		return $this;
-	}
-
-	/**
-	 * set a response HTTP-header
-	 *
-	 * @param string $key
-	 * @param string $value
-	 * @param bool $clear clear out any existing headers
-	 * @return $this
-	 */
-	public function setHeader($key, $value, $clear = false) {
-		if ($clear) {
-			$this->headers = [];
-		}
-		$this->headers[$key] = "$key: $value";
-		return $this;
-	}
-
-	/**
-	 * set the response HTTP status code
-	 *
-	 * @param $code
-	 * @return $this
-	 */
-	public function setStatusCode($code) {
-		$this->statusCode = $code;
-		return $this;
-	}
-
-	/**
-	 * sends the HTTP response
-	 *
-	 * @return $this
-	 */
-	public function send() {
-		if (!isset($this->headers['Content-Type'])) {
-			$this->setHeader('Content-Type', 'text/html; charset=' . $this->charset);
-		}
-		$this->outputHeader();
-		http_response_code($this->statusCode);
-		echo $this->body;
-		return $this;
-	}
-
-	/**
-	 * helper for easy testing
-	 */
-	public function stop() {
-		die();
-	}
-
-	/**
-	 * output all set response headers
-	 */
-	protected function outputHeader() {
-		foreach ($this->headers as $header) {
-			header($header);
-		}
-	}
+    /**
+     * @var string HTTP body
+     */
+    protected $body = '';
+
+    /**
+     * @var string charset
+     */
+    protected $charset = 'utf-8';
+
+    /**
+     * @var array HTTP-headers
+     */
+    protected $headers = [];
+
+    /**
+     * @var int HTTP status code
+     */
+    protected $statusCode = 200;
+
+    /**
+     * redirect to another URL
+     *
+     * @param string $url URL
+     * @param int $statusCode
+     */
+    public function redirect($url, $statusCode = 302) {
+        $this->setStatusCode($statusCode)
+            ->setHeader('Location', $url, true)
+            ->setBody('')
+            ->send()
+            ->stop();
+    }
+
+    /**
+     * set the response body
+     *
+     * @param $body
+     * @return $this
+     */
+    public function setBody($body) {
+        $this->body = $body;
+        return $this;
+    }
+
+    /**
+     * set the response character-set
+     *
+     * @param $charset
+     * @return $this
+     */
+    public function setCharset($charset) {
+        $this->charset = $charset;
+        return $this;
+    }
+
+    /**
+     * set a response HTTP-header
+     *
+     * @param string $key
+     * @param string $value
+     * @param bool $clear clear out any existing headers
+     * @return $this
+     */
+    public function setHeader($key, $value, $clear = false) {
+        if ($clear) {
+            $this->headers = [];
+        }
+        $this->headers[$key] = "$key: $value";
+        return $this;
+    }
+
+    /**
+     * set the response HTTP status code
+     *
+     * @param $code
+     * @return $this
+     */
+    public function setStatusCode($code) {
+        $this->statusCode = $code;
+        return $this;
+    }
+
+    /**
+     * sends the HTTP response
+     *
+     * @return $this
+     */
+    public function send() {
+        if (!isset($this->headers['Content-Type'])) {
+            $this->setHeader('Content-Type', 'text/html; charset=' . $this->charset);
+        }
+        $this->outputHeader();
+        http_response_code($this->statusCode);
+        echo $this->body;
+        return $this;
+    }
+
+    /**
+     * helper for easy testing
+     */
+    public function stop() {
+        die();
+    }
+
+    /**
+     * output all set response headers
+     */
+    protected function outputHeader() {
+        foreach ($this->headers as $header) {
+            header($header);
+        }
+    }
 
 }
 

lib/Phile/Core/ServiceLocator.php

Indentation +55 added lines, -55 removed lines

@@ -14,64 +14,64 @@
  * @package Phile\Core
  */
 class ServiceLocator {
-	/**
-	 * @var array of services
-	 */
-	protected static $services;
+    /**
+     * @var array of services
+     */
+    protected static $services;
 
-	/**
-	 * @var array $serviceMap for mapping speaking names/keys to the interfaces
-	 */
-	protected static $serviceMap = array(
-		'Phile_Cache'            => 'Phile\ServiceLocator\CacheInterface',
-		'Phile_Template'         => 'Phile\ServiceLocator\TemplateInterface',
-		'Phile_Parser'           => 'Phile\ServiceLocator\ParserInterface',
-		'Phile_Data_Persistence' => 'Phile\ServiceLocator\PersistenceInterface',
-		'Phile_Parser_Meta'      => 'Phile\ServiceLocator\MetaInterface',
-		'Phile_ErrorHandler'	 => 'Phile\ServiceLocator\ErrorHandlerInterface',
-	);
+    /**
+     * @var array $serviceMap for mapping speaking names/keys to the interfaces
+     */
+    protected static $serviceMap = array(
+        'Phile_Cache'            => 'Phile\ServiceLocator\CacheInterface',
+        'Phile_Template'         => 'Phile\ServiceLocator\TemplateInterface',
+        'Phile_Parser'           => 'Phile\ServiceLocator\ParserInterface',
+        'Phile_Data_Persistence' => 'Phile\ServiceLocator\PersistenceInterface',
+        'Phile_Parser_Meta'      => 'Phile\ServiceLocator\MetaInterface',
+        'Phile_ErrorHandler'	 => 'Phile\ServiceLocator\ErrorHandlerInterface',
+    );
 
-	/**
-	 * method to register a service
-	 *
-	 * @param string $serviceKey the key for the service
-	 * @param mixed  $object
-	 *
-	 * @throws ServiceLocatorException
-	 */
-	public static function registerService($serviceKey, $object) {
-		$interfaces = class_implements($object);
-		$interface  = self::$serviceMap[$serviceKey];
-		if ($interfaces === false || !in_array($interface, $interfaces)) {
-			throw new ServiceLocatorException("the object must implement the interface: '{$interface}'", 1398536617);
-		}
-		self::$services[$serviceKey] = $object;
-	}
+    /**
+     * method to register a service
+     *
+     * @param string $serviceKey the key for the service
+     * @param mixed  $object
+     *
+     * @throws ServiceLocatorException
+     */
+    public static function registerService($serviceKey, $object) {
+        $interfaces = class_implements($object);
+        $interface  = self::$serviceMap[$serviceKey];
+        if ($interfaces === false || !in_array($interface, $interfaces)) {
+            throw new ServiceLocatorException("the object must implement the interface: '{$interface}'", 1398536617);
+        }
+        self::$services[$serviceKey] = $object;
+    }
 
-	/**
-	 * checks if a service is registered
-	 *
-	 * @param string $serviceKey
-	 *
-	 * @return bool
-	 */
-	public static function hasService($serviceKey) {
-		return (isset(self::$services[$serviceKey]));
-	}
+    /**
+     * checks if a service is registered
+     *
+     * @param string $serviceKey
+     *
+     * @return bool
+     */
+    public static function hasService($serviceKey) {
+        return (isset(self::$services[$serviceKey]));
+    }
 
-	/**
-	 * returns a service
-	 *
-	 * @param string $serviceKey the service key
-	 *
-	 * @return mixed
-	 * @throws ServiceLocatorException
-	 */
-	public static function getService($serviceKey) {
-		if (!isset(self::$services[$serviceKey])) {
-			throw new ServiceLocatorException("the service '{$serviceKey}' is not registered", 1398536637);
-		}
+    /**
+     * returns a service
+     *
+     * @param string $serviceKey the service key
+     *
+     * @return mixed
+     * @throws ServiceLocatorException
+     */
+    public static function getService($serviceKey) {
+        if (!isset(self::$services[$serviceKey])) {
+            throw new ServiceLocatorException("the service '{$serviceKey}' is not registered", 1398536637);
+        }
 
-		return self::$services[$serviceKey];
-	}
+        return self::$services[$serviceKey];
+    }
 }

lib/Phile/Core/Event.php

Indentation +40 added lines, -40 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /**
- * The Event class
- */
+     * The Event class
+     */
 namespace Phile\Core;
 
 use Phile\Gateway\EventObserverInterface;
@@ -15,44 +15,44 @@ 
  * @package Phile\Core
  */
 class Event {
-	/**
-	 * Registry object provides storage for objects.
-	 *
-	 * @var array
-	 */
-	protected static $_registry = [];
+    /**
+     * Registry object provides storage for objects.
+     *
+     * @var array
+     */
+    protected static $_registry = [];
 
-	/**
-	 * method to register an event
-	 *
-	 * @param string $eventName the event to observe
-	 * @param EventObserverInterface|callable $object observer
-	 */
-	public static function registerEvent($eventName, $object) {
-		if ($object instanceof EventObserverInterface) {
-			$object = [$object, 'on'];
-		}
-		if (!is_callable($object)) {
-			throw new \InvalidArgumentException(
-				"Can't register event. Observer is not callable.",
-				1427814905
-			);
-		}
-		self::$_registry[$eventName][] = $object;
-	}
+    /**
+     * method to register an event
+     *
+     * @param string $eventName the event to observe
+     * @param EventObserverInterface|callable $object observer
+     */
+    public static function registerEvent($eventName, $object) {
+        if ($object instanceof EventObserverInterface) {
+            $object = [$object, 'on'];
+        }
+        if (!is_callable($object)) {
+            throw new \InvalidArgumentException(
+                "Can't register event. Observer is not callable.",
+                1427814905
+            );
+        }
+        self::$_registry[$eventName][] = $object;
+    }
 
-	/**
-	 * method to trigger an event
-	 *
-	 * @param string $eventName the event name (register for this name)
-	 * @param array $data array with some additional data
-	 */
-	public static function triggerEvent($eventName, $data = null) {
-		if (empty(self::$_registry[$eventName])) {
-			return;
-		}
-		foreach (self::$_registry[$eventName] as $observer) {
-			call_user_func_array($observer, [$eventName, $data]);
-		}
-	}
+    /**
+     * method to trigger an event
+     *
+     * @param string $eventName the event name (register for this name)
+     * @param array $data array with some additional data
+     */
+    public static function triggerEvent($eventName, $data = null) {
+        if (empty(self::$_registry[$eventName])) {
+            return;
+        }
+        foreach (self::$_registry[$eventName] as $observer) {
+            call_user_func_array($observer, [$eventName, $data]);
+        }
+    }
 }

lib/Phile/Core/Session.php

Indentation +96 added lines, -96 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /**
- * The Session class
- */
+     * The Session class
+     */
 namespace Phile\Core;
 
 /**
@@ -13,109 +13,109 @@ 
  * @package Phile\Core
  */
 class Session {
-	/** @var bool mark if session is started */
-	static public $isStarted = false;
+    /** @var bool mark if session is started */
+    static public $isStarted = false;
 
-	/** @var string the session id */
-	static public $sessionId = '';
+    /** @var string the session id */
+    static public $sessionId = '';
 
-	/**
-	 * method to start the session
-	 */
-	static public function start() {
-		if (self::$isStarted === false) {
-			session_cache_limiter('private');
-			session_cache_expire(120);
-			if (session_start()) {
-				self::$isStarted = true;
-			}
-			if (self::$isStarted) {
-				if (PHILE_CLI_MODE) {
-					$_SERVER['REMOTE_ADDR'] = (isset($_SERVER['REMOTE_ADDR'])) ? $_SERVER['REMOTE_ADDR'] : '127.0.0.1';
-				}
-				if (self::get('REMOTE_ADDR') != $_SERVER['REMOTE_ADDR']) {
-					session_destroy();
-					session_start();
-					session_regenerate_id();
-					self::set('REMOTE_ADDR', $_SERVER['REMOTE_ADDR']);
-				}
-				if (self::get('REMOTE_ADDR') === null) {
-					self::set('REMOTE_ADDR', $_SERVER['REMOTE_ADDR']);
-				}
-			}
-		}
-		self::$sessionId = session_id();
-	}
+    /**
+     * method to start the session
+     */
+    static public function start() {
+        if (self::$isStarted === false) {
+            session_cache_limiter('private');
+            session_cache_expire(120);
+            if (session_start()) {
+                self::$isStarted = true;
+            }
+            if (self::$isStarted) {
+                if (PHILE_CLI_MODE) {
+                    $_SERVER['REMOTE_ADDR'] = (isset($_SERVER['REMOTE_ADDR'])) ? $_SERVER['REMOTE_ADDR'] : '127.0.0.1';
+                }
+                if (self::get('REMOTE_ADDR') != $_SERVER['REMOTE_ADDR']) {
+                    session_destroy();
+                    session_start();
+                    session_regenerate_id();
+                    self::set('REMOTE_ADDR', $_SERVER['REMOTE_ADDR']);
+                }
+                if (self::get('REMOTE_ADDR') === null) {
+                    self::set('REMOTE_ADDR', $_SERVER['REMOTE_ADDR']);
+                }
+            }
+        }
+        self::$sessionId = session_id();
+    }
 
-	/**
-	 * method to destroy the session
-	 */
-	static public function destroy() {
-		unset($_SESSION);
-		session_destroy();
-	}
+    /**
+     * method to destroy the session
+     */
+    static public function destroy() {
+        unset($_SESSION);
+        session_destroy();
+    }
 
-	/**
-	 * method to save and close the session
-	 */
-	static public function save() {
-		session_write_close();
-	}
+    /**
+     * method to save and close the session
+     */
+    static public function save() {
+        session_write_close();
+    }
 
-	/**
-	 * method to set value into session
-	 *
-	 * @param string $key
-	 * @param mixed  $value
-	 */
-	static public function set($key, $value) {
-		if (!self::$isStarted) {
-			self::start();
-		}
-		$_SESSION[$key] = $value;
-	}
+    /**
+     * method to set value into session
+     *
+     * @param string $key
+     * @param mixed  $value
+     */
+    static public function set($key, $value) {
+        if (!self::$isStarted) {
+            self::start();
+        }
+        $_SESSION[$key] = $value;
+    }
 
-	/**
-	 * method to get value from session
-	 *
-	 * @param string $key
-	 * @param mixed  $default
-	 *
-	 * @return null|mixed
-	 */
-	static public function get($key, $default = null) {
-		if (!self::$isStarted) {
-			self::start();
-		}
+    /**
+     * method to get value from session
+     *
+     * @param string $key
+     * @param mixed  $default
+     *
+     * @return null|mixed
+     */
+    static public function get($key, $default = null) {
+        if (!self::$isStarted) {
+            self::start();
+        }
 
-		return (self::isEmpty($key)) ? $default : $_SESSION[$key];
-	}
+        return (self::isEmpty($key)) ? $default : $_SESSION[$key];
+    }
 
-	/**
-	 * get the session id
-	 *
-	 * @return string
-	 */
-	static public function getSessionId() {
-		if (!self::$isStarted) {
-			self::start();
-		}
+    /**
+     * get the session id
+     *
+     * @return string
+     */
+    static public function getSessionId() {
+        if (!self::$isStarted) {
+            self::start();
+        }
 
-		return self::$sessionId;
-	}
+        return self::$sessionId;
+    }
 
-	/**
-	 * check id key is empty/set or not
-	 *
-	 * @param $key
-	 *
-	 * @return bool
-	 */
-	static public function isEmpty($key) {
-		if (!self::$isStarted) {
-			self::start();
-		}
+    /**
+     * check id key is empty/set or not
+     *
+     * @param $key
+     *
+     * @return bool
+     */
+    static public function isEmpty($key) {
+        if (!self::$isStarted) {
+            self::start();
+        }
 
-		return (!isset($_SESSION[$key]));
-	}
+        return (!isset($_SESSION[$key]));
+    }
 }

lib/Phile/Bootstrap.php

Indentation +168 added lines, -168 removed lines

@@ -16,172 +16,172 @@
  * @version 0.1
  */
 class Bootstrap {
-	/**
-	 * @var \Phile\Bootstrap instance of Bootstrap class
-	 */
-	static protected $instance = NULL;
-
-	/**
-	 * @var array the settings array
-	 */
-	protected $settings;
-
-	/**
-	 * @var array the loaded plugins
-	 */
-	protected $plugins;
-
-	/**
-	 * the constructor
-	 * Disable direct creation of this object.
-	 */
-	protected function __construct() {
-	}
-
-	/**
-	 * Disable direct cloning of this object.
-	 */
-	protected function __clone() {
-	}
-
-	/**
-	 * Return instance of Bootstrap class as singleton
-	 *
-	 * @return Bootstrap
-	 */
-	static public function getInstance() {
-		if (is_null(static::$instance)) {
-			self::$instance = new Bootstrap();
-		}
-		return static::$instance;
-	}
-
-	/**
-	 * initialize basics
-	 */
-	public function initializeBasics() {
-		$this->initializeDefinitions();
-		$this->initializeAutoloader();
-		$this->initializeConfiguration();
-		$this->initializeFilesAndFolders();
-		$this->initializePlugins();
-		return $this;
-	}
-
-	/**
-	 * initialize the global definitions
-	 */
-	protected function initializeDefinitions() {
-		// for php unit testings, we need to check if constant is defined
-		// before setting them, because there is a bug in PHPUnit which
-		// init our bootstrap multiple times.
-		defined('PHILE_VERSION') 	or define('PHILE_VERSION',   '1.6.0');
-		defined('PHILE_CLI_MODE') 	or define('PHILE_CLI_MODE',  (php_sapi_name() == "cli") ? true : false);
-		defined('ROOT_DIR') 		or define('ROOT_DIR',        realpath(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR);
-		defined('CONTENT_DIR') 		or define('CONTENT_DIR',     ROOT_DIR . 'content' . DIRECTORY_SEPARATOR);
-		defined('CONTENT_EXT') 		or define('CONTENT_EXT',     '.md');
-		defined('LIB_DIR') 			or define('LIB_DIR',         ROOT_DIR . 'lib' . DIRECTORY_SEPARATOR);
-		defined('PLUGINS_DIR') 		or define('PLUGINS_DIR',     ROOT_DIR . 'plugins' . DIRECTORY_SEPARATOR);
-		defined('THEMES_DIR') 		or define('THEMES_DIR',      ROOT_DIR . 'themes' . DIRECTORY_SEPARATOR);
-		defined('CACHE_DIR') 		or define('CACHE_DIR',       LIB_DIR . 'cache' . DIRECTORY_SEPARATOR);
-		defined('STORAGE_DIR') or define('STORAGE_DIR', LIB_DIR . 'datastorage' . DIRECTORY_SEPARATOR);
-	}
-
-	/**
-	 * initialize the autoloader
-	 */
-	protected function initializeAutoloader() {
-		spl_autoload_extensions(".php");
-		// load phile core
-		spl_autoload_register(function ($className) {
-			$fileName = LIB_DIR . str_replace("\\", DIRECTORY_SEPARATOR, $className) . '.php';
-			if (file_exists($fileName)) {
-				require_once $fileName;
-			}
-		});
-		// load phile plugins
-		spl_autoload_register('\Phile\Plugin\PluginRepository::autoload');
-
-		require(LIB_DIR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php');
-	}
-
-	/**
-	 * initialize configuration
-	 */
-	protected function initializeConfiguration() {
-		$defaults      = Utility::load(ROOT_DIR . 'default_config.php');
-		$localSettings = Utility::load(ROOT_DIR . 'config.php');
-		if (is_array($localSettings)) {
-			$this->settings = array_replace_recursive($defaults, $localSettings);
-		} else {
-			$this->settings = $defaults;
-		}
-
-		Registry::set('Phile_Settings', $this->settings);
-		date_default_timezone_set($this->settings['timezone']);
-	}
-
-	/**
-	 * auto-setup of files and folders
-	 */
-	protected function initializeFilesAndFolders() {
-		$dirs = [
-			['path' => CACHE_DIR],
-			['path' => STORAGE_DIR]
-		];
-		$defaults = ['protected' => true];
-
-		foreach ($dirs as $dir) {
-			$dir += $defaults;
-			$path = $dir['path'];
-			if (empty($path) || strpos($path, ROOT_DIR) !== 0) {
-				continue;
-			}
-			if (!file_exists($path)) {
-				mkdir($path, 0775, true);
-			}
-			if ($dir['protected']) {
-				$file = "$path.htaccess";
-				if (!file_exists($file)) {
-					$content = "order deny,allow\ndeny from all\nallow from 127.0.0.1";
-					file_put_contents($file, $content);
-				}
-			}
-		}
-	}
-
-	/**
-	 * initialize plugins
-	 *
-	 * @throws Exception\PluginException
-	 */
-	protected function initializePlugins() {
-		$loader = new PluginRepository();
-		if (isset($this->settings['plugins']) && is_array($this->settings['plugins'])) {
-			$this->plugins = $loader->loadAll($this->settings['plugins']);
-		}
-
-		Event::triggerEvent('plugins_loaded', ['plugins' => $this->plugins]);
-
-		// throw not earlier to have the error-handler plugin loaded
-		// and initialized (by 'plugins_loaded' event)
-		$errors = $loader->getLoadErrors();
-		if (count($errors) > 0) {
-			throw new PluginException($errors[0]['message'], $errors[0]['code']);
-		}
-
-		// settings now include initialized plugin-configs
-		$this->settings = Registry::get('Phile_Settings');
-		Event::triggerEvent('config_loaded', ['config' => $this->settings]);
-	}
-
-	/**
-	 * method to get plugins
-	 * @return array
-	 * @deprecated since 1.5 will be removed
-	 * @use 'plugins_loaded' event
-	 */
-	public function getPlugins() {
-		return $this->plugins;
-	}
+    /**
+     * @var \Phile\Bootstrap instance of Bootstrap class
+     */
+    static protected $instance = NULL;
+
+    /**
+     * @var array the settings array
+     */
+    protected $settings;
+
+    /**
+     * @var array the loaded plugins
+     */
+    protected $plugins;
+
+    /**
+     * the constructor
+     * Disable direct creation of this object.
+     */
+    protected function __construct() {
+    }
+
+    /**
+     * Disable direct cloning of this object.
+     */
+    protected function __clone() {
+    }
+
+    /**
+     * Return instance of Bootstrap class as singleton
+     *
+     * @return Bootstrap
+     */
+    static public function getInstance() {
+        if (is_null(static::$instance)) {
+            self::$instance = new Bootstrap();
+        }
+        return static::$instance;
+    }
+
+    /**
+     * initialize basics
+     */
+    public function initializeBasics() {
+        $this->initializeDefinitions();
+        $this->initializeAutoloader();
+        $this->initializeConfiguration();
+        $this->initializeFilesAndFolders();
+        $this->initializePlugins();
+        return $this;
+    }
+
+    /**
+     * initialize the global definitions
+     */
+    protected function initializeDefinitions() {
+        // for php unit testings, we need to check if constant is defined
+        // before setting them, because there is a bug in PHPUnit which
+        // init our bootstrap multiple times.
+        defined('PHILE_VERSION') 	or define('PHILE_VERSION',   '1.6.0');
+        defined('PHILE_CLI_MODE') 	or define('PHILE_CLI_MODE',  (php_sapi_name() == "cli") ? true : false);
+        defined('ROOT_DIR') 		or define('ROOT_DIR',        realpath(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR);
+        defined('CONTENT_DIR') 		or define('CONTENT_DIR',     ROOT_DIR . 'content' . DIRECTORY_SEPARATOR);
+        defined('CONTENT_EXT') 		or define('CONTENT_EXT',     '.md');
+        defined('LIB_DIR') 			or define('LIB_DIR',         ROOT_DIR . 'lib' . DIRECTORY_SEPARATOR);
+        defined('PLUGINS_DIR') 		or define('PLUGINS_DIR',     ROOT_DIR . 'plugins' . DIRECTORY_SEPARATOR);
+        defined('THEMES_DIR') 		or define('THEMES_DIR',      ROOT_DIR . 'themes' . DIRECTORY_SEPARATOR);
+        defined('CACHE_DIR') 		or define('CACHE_DIR',       LIB_DIR . 'cache' . DIRECTORY_SEPARATOR);
+        defined('STORAGE_DIR') or define('STORAGE_DIR', LIB_DIR . 'datastorage' . DIRECTORY_SEPARATOR);
+    }
+
+    /**
+     * initialize the autoloader
+     */
+    protected function initializeAutoloader() {
+        spl_autoload_extensions(".php");
+        // load phile core
+        spl_autoload_register(function ($className) {
+            $fileName = LIB_DIR . str_replace("\\", DIRECTORY_SEPARATOR, $className) . '.php';
+            if (file_exists($fileName)) {
+                require_once $fileName;
+            }
+        });
+        // load phile plugins
+        spl_autoload_register('\Phile\Plugin\PluginRepository::autoload');
+
+        require(LIB_DIR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php');
+    }
+
+    /**
+     * initialize configuration
+     */
+    protected function initializeConfiguration() {
+        $defaults      = Utility::load(ROOT_DIR . 'default_config.php');
+        $localSettings = Utility::load(ROOT_DIR . 'config.php');
+        if (is_array($localSettings)) {
+            $this->settings = array_replace_recursive($defaults, $localSettings);
+        } else {
+            $this->settings = $defaults;
+        }
+
+        Registry::set('Phile_Settings', $this->settings);
+        date_default_timezone_set($this->settings['timezone']);
+    }
+
+    /**
+     * auto-setup of files and folders
+     */
+    protected function initializeFilesAndFolders() {
+        $dirs = [
+            ['path' => CACHE_DIR],
+            ['path' => STORAGE_DIR]
+        ];
+        $defaults = ['protected' => true];
+
+        foreach ($dirs as $dir) {
+            $dir += $defaults;
+            $path = $dir['path'];
+            if (empty($path) || strpos($path, ROOT_DIR) !== 0) {
+                continue;
+            }
+            if (!file_exists($path)) {
+                mkdir($path, 0775, true);
+            }
+            if ($dir['protected']) {
+                $file = "$path.htaccess";
+                if (!file_exists($file)) {
+                    $content = "order deny,allow\ndeny from all\nallow from 127.0.0.1";
+                    file_put_contents($file, $content);
+                }
+            }
+        }
+    }
+
+    /**
+     * initialize plugins
+     *
+     * @throws Exception\PluginException
+     */
+    protected function initializePlugins() {
+        $loader = new PluginRepository();
+        if (isset($this->settings['plugins']) && is_array($this->settings['plugins'])) {
+            $this->plugins = $loader->loadAll($this->settings['plugins']);
+        }
+
+        Event::triggerEvent('plugins_loaded', ['plugins' => $this->plugins]);
+
+        // throw not earlier to have the error-handler plugin loaded
+        // and initialized (by 'plugins_loaded' event)
+        $errors = $loader->getLoadErrors();
+        if (count($errors) > 0) {
+            throw new PluginException($errors[0]['message'], $errors[0]['code']);
+        }
+
+        // settings now include initialized plugin-configs
+        $this->settings = Registry::get('Phile_Settings');
+        Event::triggerEvent('config_loaded', ['config' => $this->settings]);
+    }
+
+    /**
+     * method to get plugins
+     * @return array
+     * @deprecated since 1.5 will be removed
+     * @use 'plugins_loaded' event
+     */
+    public function getPlugins() {
+        return $this->plugins;
+    }
 }

lib/Phile/Repository/Page.php

Indentation +178 added lines, -178 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /**
- * the page repository class
- */
+     * the page repository class
+     */
 namespace Phile\Repository;
 
 use Phile\Core\Registry;
@@ -17,181 +17,181 @@ 
  * @package Phile\Repository
  */
 class Page {
-	/**
-	 * @var array the settings array
-	 */
-	protected $settings;
-
-	/**
-	 * @var array object storage for initialized objects, to prevent multiple loading of objects.
-	 */
-	protected $storage = array();
-
-	/**
-	 * @var \Phile\ServiceLocator\CacheInterface the cache implementation
-	 */
-	protected $cache = null;
-
-	/**
-	 * the constructor
-	 */
-	public function __construct($settings = null) {
-		if ($settings === null) {
-			$settings = Registry::get('Phile_Settings');
-		}
-		$this->settings = $settings;
-		if (ServiceLocator::hasService('Phile_Cache')) {
-			$this->cache = ServiceLocator::getService('Phile_Cache');
-		}
-	}
-
-	/**
-	 * find a page by path
-	 *
-	 * @param string $pageId
-	 * @param string $folder
-	 *
-	 * @return null|\Phile\Model\Page
-	 */
-	public function findByPath($pageId, $folder = CONTENT_DIR) {
-		// be merciful to lazy third-party-usage and accept a leading slash
-		$pageId = ltrim($pageId, '/');
-		// 'sub/' should serve page 'sub/index'
-		if ($pageId === '' || substr($pageId, -1) === '/') {
-			$pageId .= 'index';
-		}
-
-		$file = $folder . $pageId . CONTENT_EXT;
-		if (!file_exists($file)) {
-			if (substr($pageId, -6) === '/index') {
-				// try to resolve sub-directory 'sub/' to page 'sub'
-				$pageId = substr($pageId, 0, strlen($pageId) - 6);
-			} else {
-				// try to resolve page 'sub' to sub-directory 'sub/'
-				$pageId .= '/index';
-			}
-			$file = $folder . $pageId . CONTENT_EXT;
-		}
-		if (!file_exists($file)) {
-			return null;
-		}
-		return $this->getPage($file, $folder);
-	}
-
-	/**
-	 * find all pages (*.md) files and returns an array of Page models
-	 *
-	 * @param array  $options
-	 * @param string $folder
-	 *
-	 * @return PageCollection of \Phile\Model\Page objects
-	 */
-	public function findAll(array $options = array(), $folder = CONTENT_DIR) {
-		return new PageCollection(function() use ($options, $folder){
-			$options += $this->settings;
-			// ignore files with a leading '.' in its filename
-			$files = Utility::getFiles($folder, '\Phile\FilterIterator\ContentFileFilterIterator');
-			$pages = array();
-			foreach ($files as $file) {
-				if (str_replace($folder, '', $file) == '404' . CONTENT_EXT) {
-					// jump to next page if file is the 404 page
-					continue;
-				}
-				$pages[] = $this->getPage($file, $folder);
-			}
-
-			if (empty($options['pages_order'])) {
-				return $pages;
-			}
-
-			// parse search	criteria
-			$terms = preg_split('/\s+/', $options['pages_order'], -1, PREG_SPLIT_NO_EMPTY);
-			foreach ($terms as $term) {
-				$term = explode('.', $term);
-				if (count($term) > 1) {
-					$type = array_shift($term);
-				} else {
-					$type = null;
-				}
-				$term = explode(':', $term[0]);
-				$sorting[] = array('type' => $type, 'key' => $term[0], 'order' => $term[1]);
-			}
-
-			// prepare search criteria for array_multisort
-			foreach ($sorting as $sort) {
-				$key = $sort['key'];
-				$column = array();
-				foreach ($pages as $page) {
-					/** @var \Phile\Model\Page $page */
-					$meta = $page->getMeta();
-					if ($sort['type'] === 'page') {
-						$method = 'get' . ucfirst($key);
-						$value = $page->$method();
-					} elseif ($sort['type'] === 'meta') {
-						$value = $meta->get($key);
-					} else {
-						continue 2; // ignore unhandled search term
-					}
-					$column[] = $value;
-				}
-				$sortHelper[] = $column;
-				$sortHelper[] = constant('SORT_' . strtoupper($sort['order']));
-			}
-			$sortHelper[] = &$pages;
-
-			call_user_func_array('array_multisort', $sortHelper);
-
-			return $pages;
-		});
-	}
-
-	/**
-	 * return page at offset from $page in applied search order
-	 *
-	 * @param \Phile\Model\Page $page
-	 * @param int $offset
-	 * @return null|\Phile\Model\Page
-	 */
-	public function getPageOffset(\Phile\Model\Page $page, $offset = 0) {
-		$pages = $this->findAll();
-		$order = array();
-		foreach ($pages as $p) {
-			$order[] = $p->getFilePath();
-		}
-		$key = array_search($page->getFilePath(), $order) + $offset;
-		if (!isset($order[$key])) {
-			return null;
-		}
-		return $this->getPage($order[$key]);
-	}
-
-	/**
-	 * get page from cache or filepath
-	 *
-	 * @param        $filePath
-	 * @param string $folder
-	 *
-	 * @return mixed|\Phile\Model\Page
-	 */
-	protected function getPage($filePath, $folder = CONTENT_DIR) {
-		$key = 'Phile_Model_Page_' . md5($filePath);
-		if (isset($this->storage[$key])) {
-			return $this->storage[$key];
-		}
-
-		if ($this->cache !== null) {
-			if ($this->cache->has($key)) {
-				$page = $this->cache->get($key);
-			} else {
-				$page = new \Phile\Model\Page($filePath, $folder);
-				$this->cache->set($key, $page);
-			}
-		} else {
-			$page = new \Phile\Model\Page($filePath, $folder);
-		}
-		$this->storage[$key] = $page;
-
-		return $page;
-	}
+    /**
+     * @var array the settings array
+     */
+    protected $settings;
+
+    /**
+     * @var array object storage for initialized objects, to prevent multiple loading of objects.
+     */
+    protected $storage = array();
+
+    /**
+     * @var \Phile\ServiceLocator\CacheInterface the cache implementation
+     */
+    protected $cache = null;
+
+    /**
+     * the constructor
+     */
+    public function __construct($settings = null) {
+        if ($settings === null) {
+            $settings = Registry::get('Phile_Settings');
+        }
+        $this->settings = $settings;
+        if (ServiceLocator::hasService('Phile_Cache')) {
+            $this->cache = ServiceLocator::getService('Phile_Cache');
+        }
+    }
+
+    /**
+     * find a page by path
+     *
+     * @param string $pageId
+     * @param string $folder
+     *
+     * @return null|\Phile\Model\Page
+     */
+    public function findByPath($pageId, $folder = CONTENT_DIR) {
+        // be merciful to lazy third-party-usage and accept a leading slash
+        $pageId = ltrim($pageId, '/');
+        // 'sub/' should serve page 'sub/index'
+        if ($pageId === '' || substr($pageId, -1) === '/') {
+            $pageId .= 'index';
+        }
+
+        $file = $folder . $pageId . CONTENT_EXT;
+        if (!file_exists($file)) {
+            if (substr($pageId, -6) === '/index') {
+                // try to resolve sub-directory 'sub/' to page 'sub'
+                $pageId = substr($pageId, 0, strlen($pageId) - 6);
+            } else {
+                // try to resolve page 'sub' to sub-directory 'sub/'
+                $pageId .= '/index';
+            }
+            $file = $folder . $pageId . CONTENT_EXT;
+        }
+        if (!file_exists($file)) {
+            return null;
+        }
+        return $this->getPage($file, $folder);
+    }
+
+    /**
+     * find all pages (*.md) files and returns an array of Page models
+     *
+     * @param array  $options
+     * @param string $folder
+     *
+     * @return PageCollection of \Phile\Model\Page objects
+     */
+    public function findAll(array $options = array(), $folder = CONTENT_DIR) {
+        return new PageCollection(function() use ($options, $folder){
+            $options += $this->settings;
+            // ignore files with a leading '.' in its filename
+            $files = Utility::getFiles($folder, '\Phile\FilterIterator\ContentFileFilterIterator');
+            $pages = array();
+            foreach ($files as $file) {
+                if (str_replace($folder, '', $file) == '404' . CONTENT_EXT) {
+                    // jump to next page if file is the 404 page
+                    continue;
+                }
+                $pages[] = $this->getPage($file, $folder);
+            }
+
+            if (empty($options['pages_order'])) {
+                return $pages;
+            }
+
+            // parse search	criteria
+            $terms = preg_split('/\s+/', $options['pages_order'], -1, PREG_SPLIT_NO_EMPTY);
+            foreach ($terms as $term) {
+                $term = explode('.', $term);
+                if (count($term) > 1) {
+                    $type = array_shift($term);
+                } else {
+                    $type = null;
+                }
+                $term = explode(':', $term[0]);
+                $sorting[] = array('type' => $type, 'key' => $term[0], 'order' => $term[1]);
+            }
+
+            // prepare search criteria for array_multisort
+            foreach ($sorting as $sort) {
+                $key = $sort['key'];
+                $column = array();
+                foreach ($pages as $page) {
+                    /** @var \Phile\Model\Page $page */
+                    $meta = $page->getMeta();
+                    if ($sort['type'] === 'page') {
+                        $method = 'get' . ucfirst($key);
+                        $value = $page->$method();
+                    } elseif ($sort['type'] === 'meta') {
+                        $value = $meta->get($key);
+                    } else {
+                        continue 2; // ignore unhandled search term
+                    }
+                    $column[] = $value;
+                }
+                $sortHelper[] = $column;
+                $sortHelper[] = constant('SORT_' . strtoupper($sort['order']));
+            }
+            $sortHelper[] = &$pages;
+
+            call_user_func_array('array_multisort', $sortHelper);
+
+            return $pages;
+        });
+    }
+
+    /**
+     * return page at offset from $page in applied search order
+     *
+     * @param \Phile\Model\Page $page
+     * @param int $offset
+     * @return null|\Phile\Model\Page
+     */
+    public function getPageOffset(\Phile\Model\Page $page, $offset = 0) {
+        $pages = $this->findAll();
+        $order = array();
+        foreach ($pages as $p) {
+            $order[] = $p->getFilePath();
+        }
+        $key = array_search($page->getFilePath(), $order) + $offset;
+        if (!isset($order[$key])) {
+            return null;
+        }
+        return $this->getPage($order[$key]);
+    }
+
+    /**
+     * get page from cache or filepath
+     *
+     * @param        $filePath
+     * @param string $folder
+     *
+     * @return mixed|\Phile\Model\Page
+     */
+    protected function getPage($filePath, $folder = CONTENT_DIR) {
+        $key = 'Phile_Model_Page_' . md5($filePath);
+        if (isset($this->storage[$key])) {
+            return $this->storage[$key];
+        }
+
+        if ($this->cache !== null) {
+            if ($this->cache->has($key)) {
+                $page = $this->cache->get($key);
+            } else {
+                $page = new \Phile\Model\Page($filePath, $folder);
+                $this->cache->set($key, $page);
+            }
+        } else {
+            $page = new \Phile\Model\Page($filePath, $folder);
+        }
+        $this->storage[$key] = $page;
+
+        return $page;
+    }
 
 }