PhileCMS / Phile

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;
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -75,15 +75,15 @@ 
 		// 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('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);
 	}
 
@@ -93,7 +93,7 @@ 
 	protected function initializeAutoloader() {
 		spl_autoload_extensions(".php");
 		// load phile core
-		spl_autoload_register(function ($className) {
+		spl_autoload_register(function($className) {
 			$fileName = LIB_DIR . str_replace("\\", DIRECTORY_SEPARATOR, $className) . '.php';
 			if (file_exists($fileName)) {
 				require_once $fileName;

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 	/**
 	 * @var \Phile\Bootstrap instance of Bootstrap class
 	 */
-	static protected $instance = NULL;
+	static protected $instance = null;
 
 	/**
 	 * @var array the settings array

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;
+    }
 
 }

lib/Phile/Repository/PageCollection.php

Indentation +59 added lines, -59 removed lines

@@ -11,73 +11,73 @@
  * @package Phile\Repository
  */
 class PageCollection implements \ArrayAccess, \IteratorAggregate, \Countable {
-	/**
-	 * @var callback A function to be used for loading the pages.
-	 */
-	private	$loader;
+    /**
+     * @var callback A function to be used for loading the pages.
+     */
+    private	$loader;
 
-	/**
-	 * @var array of \Phile\Model\Page
-	 */
-	private	$pages;
+    /**
+     * @var array of \Phile\Model\Page
+     */
+    private	$pages;
 
-	/**
-	 * Constructor.
-	 *
-	 * @param callable $loader pages loader
-	 */
-	public function __construct(callable $loader) {
-		$this->loader = $loader;
-	}
+    /**
+     * Constructor.
+     *
+     * @param callable $loader pages loader
+     */
+    public function __construct(callable $loader) {
+        $this->loader = $loader;
+    }
 
-	/**
-	 * Perform page loading.
-	 *
-	 * @return void
-	 */
-	private function load() {
-		if ($this->pages === null) {
-			$this->pages = call_user_func($this->loader);
-		}
-	}
+    /**
+     * Perform page loading.
+     *
+     * @return void
+     */
+    private function load() {
+        if ($this->pages === null) {
+            $this->pages = call_user_func($this->loader);
+        }
+    }
 
-	/**
-	 * Get pages in a array.
-	 *
-	 * @return array of \Phile\Model\Page
-	 */
-	public function toArray() {
-		$this->load();
-		return $this->pages;
-	}
+    /**
+     * Get pages in a array.
+     *
+     * @return array of \Phile\Model\Page
+     */
+    public function toArray() {
+        $this->load();
+        return $this->pages;
+    }
 
-	public function getIterator() {
-		$this->load();
-		return new \ArrayIterator($this->pages);
-	}
+    public function getIterator() {
+        $this->load();
+        return new \ArrayIterator($this->pages);
+    }
 
-	public function offsetExists($offset) {
-		$this->load();
-		return isset($this->pages[$offset]);
-	}
+    public function offsetExists($offset) {
+        $this->load();
+        return isset($this->pages[$offset]);
+    }
 
-	public function	offsetGet($offset) {
-		$this->load();
-		return $this->pages[$offset];
-	}
+    public function	offsetGet($offset) {
+        $this->load();
+        return $this->pages[$offset];
+    }
 
-	public function	offsetSet($offset, $value) {
-		$this->load();
-		$this->pages[$offset] =	$value;
-	}
+    public function	offsetSet($offset, $value) {
+        $this->load();
+        $this->pages[$offset] =	$value;
+    }
 
-	public function	offsetUnset($offset) {
-		$this->load();
-		unset($this->pages[$offset]);
-	}
+    public function	offsetUnset($offset) {
+        $this->load();
+        unset($this->pages[$offset]);
+    }
 
-	public function	count() {
-		$this->load();
-		return count($this->pages);
-	}
+    public function	count() {
+        $this->load();
+        return count($this->pages);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 
 	public function	offsetSet($offset, $value) {
 		$this->load();
-		$this->pages[$offset] =	$value;
+		$this->pages[$offset] = $value;
 	}
 
 	public function	offsetUnset($offset) {