jacobemerick / web

collector/image/PhotoCollector.class.inc.php

Indentation +10 added lines, -10 removed lines

@@ -5,9 +5,9 @@ 
 final class PhotoCollector extends Collector
 {
 
-	public static function fetchRow($category, $photo)
-	{
-		$query = "
+    public static function fetchRow($category, $photo)
+    {
+        $query = "
 			SELECT
 				`photo`.`name`,
 				`photo_category`.`name` AS `category`,
@@ -24,12 +24,12 @@ 
 				`photo`.`name` = '{$photo}' &&
 				`photo_category`.`name` = '{$category}'
 			LIMIT 1";
-		return self::run_row_query($query);
-	}
+        return self::run_row_query($query);
+    }
 
-	public static function getRow($id)
-	{
-		$query = "
+    public static function getRow($id)
+    {
+        $query = "
 			SELECT
 				`photo`.`name`,
 				`photo_category`.`name` AS `category`,
@@ -45,7 +45,7 @@ 
 				`photo`.`photographer` = `photographer`.`id` &&
 				`photo`.`id` = '{$id}'
 			LIMIT 1";
-		return self::run_row_query($query);
-	}
+        return self::run_row_query($query);
+    }
 
 }

collector/Collector.class.inc.php

Indentation +24 added lines, -24 removed lines

@@ -5,29 +5,29 @@
 abstract class Collector
 {
 
-	protected static function run_query($query)
-	{
-		return Database::select($query);
-	}
-
-	protected static function run_row_query($query)
-	{
-		return Database::selectRow($query);
-	}
-
-	protected static function get_count($query)
-	{
-		return Database::selectRow($query)->count;
-	}
-
-	protected static function check_exists($query)
-	{
-		return Database::selectRow($query) !== null;
-	}
-
-	protected static function escape($string)
-	{
-		return Database::escape($string);
-	}
+    protected static function run_query($query)
+    {
+        return Database::select($query);
+    }
+
+    protected static function run_row_query($query)
+    {
+        return Database::selectRow($query);
+    }
+
+    protected static function get_count($query)
+    {
+        return Database::selectRow($query)->count;
+    }
+
+    protected static function check_exists($query)
+    {
+        return Database::selectRow($query) !== null;
+    }
+
+    protected static function escape($string)
+    {
+        return Database::escape($string);
+    }
 
 }

controller/Error301Controller.class.inc.php

Indentation +7 added lines, -7 removed lines

@@ -5,13 +5,13 @@
 class Error301Controller extends PageController
 {
 
-	public function __construct($uri)
-	{
-		Header::redirect($uri);
-		exit;
-	}
+    public function __construct($uri)
+    {
+        Header::redirect($uri);
+        exit;
+    }
 
-	protected function set_head_data() {}
-	protected function set_body_data() {}
+    protected function set_head_data() {}
+    protected function set_body_data() {}
 
 }

controller/AJAXController.class.inc.php

Indentation +45 added lines, -45 removed lines

@@ -1,60 +1,60 @@
 <?php
 
 Loader::load('utility', array(
-	'Header',
-	'Request'));
+    'Header',
+    'Request'));
 
 abstract class AJAXController
 {
 
-	private static $RESPONSE_HEADER = 'sendJSON';
+    private static $RESPONSE_HEADER = 'sendJSON';
 
-	private $response = array();
+    private $response = array();
 
-	abstract protected function set_data();
+    abstract protected function set_data();
 
-	function __construct() {}
+    function __construct() {}
 
-	public function activate()
-	{
-		call_user_func(array('Header', self::$RESPONSE_HEADER));
+    public function activate()
+    {
+        call_user_func(array('Header', self::$RESPONSE_HEADER));
 		
-		$this->set_data();
-		echo $this->response_as_json();
-	}
-
-	protected function set_response($message, $type = 'internal')
-	{
-		switch($type)
-		{
-			case 'internal' :
-				$this->response['internal'] = $message;
-			break;
-			case 'error' :
-				$this->response['error'] = $message;
-			default :
-				$this->response[$type] = $message;
-			break;
-		}
-	}
-
-	protected function fail_response($message)
-	{
-		$this->set_response($message, 'error');
-		return false;
-	}
-
-	protected function eject($message)
-	{
-		$this->fail_response($message);
-		echo $this->response_as_json();
-		exit();
-	}
-
-	private function response_as_json()
-	{
-		return json_encode($this->response);
-	}
+        $this->set_data();
+        echo $this->response_as_json();
+    }
+
+    protected function set_response($message, $type = 'internal')
+    {
+        switch($type)
+        {
+            case 'internal' :
+                $this->response['internal'] = $message;
+            break;
+            case 'error' :
+                $this->response['error'] = $message;
+            default :
+                $this->response[$type] = $message;
+            break;
+        }
+    }
+
+    protected function fail_response($message)
+    {
+        $this->set_response($message, 'error');
+        return false;
+    }
+
+    protected function eject($message)
+    {
+        $this->fail_response($message);
+        echo $this->response_as_json();
+        exit();
+    }
+
+    private function response_as_json()
+    {
+        return json_encode($this->response);
+    }
 
 }
 

controller/home/HomeController.class.inc.php

Indentation +41 added lines, -41 removed lines

@@ -8,58 +8,58 @@
 final class HomeController extends DefaultPageController
 {
 
-	private static $TITLE = "Jacob Emerick's Home | Web Developer, Hiker, Innovator";
-	private static $DESCRIPTION = 'Home page for Jacob Emerick, with links to his blog, waterfall site, and other side projects';
+    private static $TITLE = "Jacob Emerick's Home | Web Developer, Hiker, Innovator";
+    private static $DESCRIPTION = 'Home page for Jacob Emerick, with links to his blog, waterfall site, and other side projects';
 
-	private static $KEYWORD_ARRAY = array(
-		'Jacob Emerick',
-		'jacobemerick',
-		'jpemeric',
-		'home',
-		'web developer',
-		'hiker',
-		'application programmer',
-		'innovator');
+    private static $KEYWORD_ARRAY = array(
+        'Jacob Emerick',
+        'jacobemerick',
+        'jpemeric',
+        'home',
+        'web developer',
+        'hiker',
+        'application programmer',
+        'innovator');
 
-	private static $POST_LENGTH_SHORT = 160;
-	private static $POST_LENGTH_LONG = 240;
+    private static $POST_LENGTH_SHORT = 160;
+    private static $POST_LENGTH_LONG = 240;
 
-	protected function set_head_data()
-	{
-		$this->set_title(self::$TITLE);
-		$this->set_description(self::$DESCRIPTION);
-		$this->set_keywords(self::$KEYWORD_ARRAY);
+    protected function set_head_data()
+    {
+        $this->set_title(self::$TITLE);
+        $this->set_description(self::$DESCRIPTION);
+        $this->set_keywords(self::$KEYWORD_ARRAY);
 		
-		parent::set_head_data();
-	}
+        parent::set_head_data();
+    }
 
-	protected function set_body_data()
-	{
-		$this->set_body('post_array', $this->get_recent_posts());
-		$this->set_body_view('Home');
+    protected function set_body_data()
+    {
+        $this->set_body('post_array', $this->get_recent_posts());
+        $this->set_body_view('Home');
 		
-		parent::set_body_data();
-	}
+        parent::set_body_data();
+    }
 
-	private function get_recent_posts()
-	{
+    private function get_recent_posts()
+    {
     global $container;
     $postRepository = new MysqlPostRepository($container['db_connection_locator']);
     $recentPosts = $postRepository->getActivePosts(3);
 
-		$recent_post_array = array();
-		foreach($recentPosts as $postResult)
-		{
-			$post = new stdclass();
-			$post->title = $postResult['title'];
-			$post->url = Loader::getRootUrl('blog') . "{$postResult['category']}/{$postResult['path']}/";
-			$post->category = ucwords(str_replace('-', ' ', $postResult['category']));
-			$post->thumb = Content::instance('FetchFirstPhoto', $postResult['body'])->activate();
-			$post->body = Content::instance('SmartTrim', $postResult['body'])->activate(($post->thumb !== '') ? self::$POST_LENGTH_SHORT : self::$POST_LENGTH_LONG);
+        $recent_post_array = array();
+        foreach($recentPosts as $postResult)
+        {
+            $post = new stdclass();
+            $post->title = $postResult['title'];
+            $post->url = Loader::getRootUrl('blog') . "{$postResult['category']}/{$postResult['path']}/";
+            $post->category = ucwords(str_replace('-', ' ', $postResult['category']));
+            $post->thumb = Content::instance('FetchFirstPhoto', $postResult['body'])->activate();
+            $post->body = Content::instance('SmartTrim', $postResult['body'])->activate(($post->thumb !== '') ? self::$POST_LENGTH_SHORT : self::$POST_LENGTH_LONG);
 						
-			$recent_post_array[] = $post;
-		}
-		return $recent_post_array;
-	}
+            $recent_post_array[] = $post;
+        }
+        return $recent_post_array;
+    }
 
 }

controller/Error303Controller.class.inc.php

Indentation +7 added lines, -7 removed lines

@@ -5,13 +5,13 @@
 class Error303Controller extends PageController
 {
 
-	public function __construct($uri)
-	{
-		Header::redirect($uri, 303);
-		exit;
-	}
+    public function __construct($uri)
+    {
+        Header::redirect($uri, 303);
+        exit;
+    }
 
-	protected function set_head_data() {}
-	protected function set_body_data() {}
+    protected function set_head_data() {}
+    protected function set_body_data() {}
 
 }

utility/URLDecode.class.inc.php

Indentation +61 added lines, -61 removed lines

@@ -3,35 +3,35 @@ 
 class URLDecode
 {
 
-	private static $array = array();
+    private static $array = array();
 
-	static function init()
-	{
-		$host = $_SERVER['HTTP_HOST'];
-		$uri = $_SERVER['REQUEST_URI'];
-		self::form_url_array($host, $uri);
-	}
+    static function init()
+    {
+        $host = $_SERVER['HTTP_HOST'];
+        $uri = $_SERVER['REQUEST_URI'];
+        self::form_url_array($host, $uri);
+    }
 
-	static private function form_url_array($host, $uri)
-	{
-		$uri = substr($uri, 1);
-		if(strpos($uri, '?'))
-			$uri = substr($uri, 0, strpos($uri, '?'));
-		$uri_array = explode('/', $uri);
+    static private function form_url_array($host, $uri)
+    {
+        $uri = substr($uri, 1);
+        if(strpos($uri, '?'))
+            $uri = substr($uri, 0, strpos($uri, '?'));
+        $uri_array = explode('/', $uri);
 		
-		if(!Loader::isLive())
-			$host = substr($host, strpos($host, '.') + 1);
+        if(!Loader::isLive())
+            $host = substr($host, strpos($host, '.') + 1);
 		
-		self::$array['host'] = $host;
+        self::$array['host'] = $host;
 		
     if (
-      $host == 'www.waterfallsofthekeweenaw.com' ||
+        $host == 'www.waterfallsofthekeweenaw.com' ||
       $host == 'waterfallsofthekeweenaw.com'
     ) {
-			self::$array['site'] = 'waterfalls';
-		} else {
-			self::$array['site'] = substr($host, 0, strpos($host, '.'));
-		}
+            self::$array['site'] = 'waterfalls';
+        } else {
+            self::$array['site'] = substr($host, 0, strpos($host, '.'));
+        }
 
     $base = '';
     $base .= (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
@@ -40,55 +40,55 @@ 
     $base .= $host;
     $base .= '/';
 
-		self::$array['base'] = $base;
-		self::$array['uri'] = '/' . implode('/', $uri_array);
+        self::$array['base'] = $base;
+        self::$array['uri'] = '/' . implode('/', $uri_array);
 		
-		if(end($uri_array) == '')
-			$uri_array = array_slice($uri_array, 0, count($uri_array) - 1);
-		self::$array['pieces'] = (array) $uri_array;
-	}
+        if(end($uri_array) == '')
+            $uri_array = array_slice($uri_array, 0, count($uri_array) - 1);
+        self::$array['pieces'] = (array) $uri_array;
+    }
 
-	static function getSite()
-	{
-		return self::$array['site'];
-	}
+    static function getSite()
+    {
+        return self::$array['site'];
+    }
 
-	static function getHost()
-	{
-		return self::$array['host'];
-	}
+    static function getHost()
+    {
+        return self::$array['host'];
+    }
 
-	static function getBase()
-	{
-		return self::$array['base'];
-	}
+    static function getBase()
+    {
+        return self::$array['base'];
+    }
 
-	static function getURI()
-	{
-		return self::$array['uri'];
-	}
+    static function getURI()
+    {
+        return self::$array['uri'];
+    }
 
-	static function getExtension()
-	{
-		$file = self::getPiece(-1);
-		if(substr($file, -1) == '/')
-			return false;
-		return substr($file, strrpos($file, '.') + 1);;
-	}
+    static function getExtension()
+    {
+        $file = self::getPiece(-1);
+        if(substr($file, -1) == '/')
+            return false;
+        return substr($file, strrpos($file, '.') + 1);;
+    }
 
-	static function getPiece($piece = null)
-	{
-		if(!$piece)
-			return self::$array['pieces'];
+    static function getPiece($piece = null)
+    {
+        if(!$piece)
+            return self::$array['pieces'];
 		
-		if($piece == -1)
-			return end(self::$array['pieces']);
+        if($piece == -1)
+            return end(self::$array['pieces']);
 		
-		$piece = $piece - 1;
-		if(array_key_exists($piece, self::$array['pieces']))
-			return self::$array['pieces'][$piece];
-		return;
-	}
+        $piece = $piece - 1;
+        if(array_key_exists($piece, self::$array['pieces']))
+            return self::$array['pieces'][$piece];
+        return;
+    }
 
 }
 

utility/Database.class.inc.php

Indentation +122 added lines, -122 removed lines

@@ -3,19 +3,19 @@ 
 final class Database
 {
 
-	private $read_connection;
-	private $write_connection;
-	private $query_log = array();
-	private $query_total = array(
-		'count' => 0,
-		'time' => 0);
+    private $read_connection;
+    private $write_connection;
+    private $query_log = array();
+    private $query_total = array(
+        'count' => 0,
+        'time' => 0);
 
-	private $has_connection_error = false;
+    private $has_connection_error = false;
 
-	private static $instance;
+    private static $instance;
 
-	private function __construct($write_params, $read_params)
-	{
+    private function __construct($write_params, $read_params)
+    {
         $this->write_connection = $this->connect(
             $write_params->host,
             $write_params->user,
@@ -28,23 +28,23 @@ 
             $read_params->password
         );
 
-		return $this;
-	}
+        return $this;
+    }
 
-	private function connect($host, $username, $password)
-	{
-		$mysqli = new mysqli($host, $username, $password);
+    private function connect($host, $username, $password)
+    {
+        $mysqli = new mysqli($host, $username, $password);
 		
-		$has_connection_error = $mysqli->connect_error;
-		if(isset($has_connection_error))
-			$this->has_connection_error = true;
+        $has_connection_error = $mysqli->connect_error;
+        if(isset($has_connection_error))
+            $this->has_connection_error = true;
 		
-		return $mysqli;
-	}
+        return $mysqli;
+    }
 
-	public static function instance()
-	{
-		if(!isset(self::$instance)) {
+    public static function instance()
+    {
+        if(!isset(self::$instance)) {
             global $config;
             self::$instance = new Database(
                 $config->database->master,
@@ -52,107 +52,107 @@ 
             );
         }
 
-		return self::$instance;
-	}
-
-	public static function escape($string)
-	{
-		return self::instance()->read_connection->real_escape_string($string);
-	}
-
-	public static function select($query)
-	{
-		$start = microtime(true);
-		if($result = self::instance()->read_connection->query($query))
-		{
-			self::instance()->log_query($query, $start);
-			$array = array();
-			while($row = $result->fetch_object())
-				$array[] = $row;
-			$result->close();
-			return $array;
-		}
-		trigger_error('Could not preform query - ' . $query . ' - ' . self::instance()->read_connection->error);
-		return false;
-	}
-
-	public static function selectRow($query)
-	{
-		$result = self::select($query);
-		if(is_array($result))
-			return array_pop($result);
-		return false;
-	}
-
-	public static function execute($query)
-	{
-		$start = microtime(true);
-		if(self::instance()->write_connection->query($query))
-		{
-			self::instance()->log_query($query, $start);
-			return true;
-		}
-		trigger_error('Could not preform query - ' . $query . '-' . self::instance()->write_connection->error);
-		return false;
-	}
-
-	public static function lastInsertID()
-	{
-		$id = self::instance()->write_connection->insert_id;
-		if($id == 0)
-			return false;
-		return $id;
-	}
-
-	private function log_query($query, $start)
-	{
-		$time = (microtime(true) - $start) * 1000;
-		$query = array(
-			'sql' => $query,
-			'time' => $time);
-		array_push($this->query_log, $query);
+        return self::$instance;
+    }
+
+    public static function escape($string)
+    {
+        return self::instance()->read_connection->real_escape_string($string);
+    }
+
+    public static function select($query)
+    {
+        $start = microtime(true);
+        if($result = self::instance()->read_connection->query($query))
+        {
+            self::instance()->log_query($query, $start);
+            $array = array();
+            while($row = $result->fetch_object())
+                $array[] = $row;
+            $result->close();
+            return $array;
+        }
+        trigger_error('Could not preform query - ' . $query . ' - ' . self::instance()->read_connection->error);
+        return false;
+    }
+
+    public static function selectRow($query)
+    {
+        $result = self::select($query);
+        if(is_array($result))
+            return array_pop($result);
+        return false;
+    }
+
+    public static function execute($query)
+    {
+        $start = microtime(true);
+        if(self::instance()->write_connection->query($query))
+        {
+            self::instance()->log_query($query, $start);
+            return true;
+        }
+        trigger_error('Could not preform query - ' . $query . '-' . self::instance()->write_connection->error);
+        return false;
+    }
+
+    public static function lastInsertID()
+    {
+        $id = self::instance()->write_connection->insert_id;
+        if($id == 0)
+            return false;
+        return $id;
+    }
+
+    private function log_query($query, $start)
+    {
+        $time = (microtime(true) - $start) * 1000;
+        $query = array(
+            'sql' => $query,
+            'time' => $time);
+        array_push($this->query_log, $query);
 		
-		$this->query_total['count']++;
-		$this->query_total['time'] += $time;
-	}
-
-	private function gather_query_data()
-	{
-		$query_data = array();
-		foreach($this->query_log as $query)
-		{
-			$query = self::explain($query);
-			$query_data[] = $query;
-		}
-		return $query_data;
-	}
-
-	public static function explain($query)
-	{
-		$sql = 'EXPLAIN ' . $query['sql'];
+        $this->query_total['count']++;
+        $this->query_total['time'] += $time;
+    }
+
+    private function gather_query_data()
+    {
+        $query_data = array();
+        foreach($this->query_log as $query)
+        {
+            $query = self::explain($query);
+            $query_data[] = $query;
+        }
+        return $query_data;
+    }
+
+    public static function explain($query)
+    {
+        $sql = 'EXPLAIN ' . $query['sql'];
 		
-		if($result = self::instance()->read_connection->query($sql))
-		{
-			$row = $result->fetch_assoc();
-			$query['explain'] = $row;
-		}
+        if($result = self::instance()->read_connection->query($sql))
+        {
+            $row = $result->fetch_assoc();
+            $query['explain'] = $row;
+        }
 		
-		return $query;
-	}
-
-	public static function getQueryLog()
-	{
-		return self::instance()->gather_query_data();
-	}
-
-	public static function getQueryTotals()
-	{
-		return self::instance()->query_total;
-	}
-
-	public static function isConnected()
-	{
-		return !self::instance()->has_connection_error;
-	}
+        return $query;
+    }
+
+    public static function getQueryLog()
+    {
+        return self::instance()->gather_query_data();
+    }
+
+    public static function getQueryTotals()
+    {
+        return self::instance()->query_total;
+    }
+
+    public static function isConnected()
+    {
+        return !self::instance()->has_connection_error;
+    }
 
 }

utility/Loader.class.inc.php

Indentation +160 added lines, -160 removed lines

@@ -3,175 +3,175 @@
 final class Loader
 {
 
-	private $root;
-	private $is_live;
-	private $included_files = array();
-
-	private static $instance;
-
-	private function __construct()
-	{
-		$this->is_live = (isset($_SERVER['HTTP_HOST']) && substr($_SERVER['HTTP_HOST'], 0, 4) !== 'dev.');
-		return $this;
-	}
-
-	public static function instance()
-	{
-		if(!isset(self::$instance))
-			self::$instance = new Loader();
-		return self::$instance;
-	}
-
-	private function get_root()
-	{
-		if(!isset($this->root))
-		{
-			$current_directory = dirname(__FILE__);
-			$current_directory = substr($current_directory, 0, -7);
-			$this->root = $current_directory;
-		}
+    private $root;
+    private $is_live;
+    private $included_files = array();
+
+    private static $instance;
+
+    private function __construct()
+    {
+        $this->is_live = (isset($_SERVER['HTTP_HOST']) && substr($_SERVER['HTTP_HOST'], 0, 4) !== 'dev.');
+        return $this;
+    }
+
+    public static function instance()
+    {
+        if(!isset(self::$instance))
+            self::$instance = new Loader();
+        return self::$instance;
+    }
+
+    private function get_root()
+    {
+        if(!isset($this->root))
+        {
+            $current_directory = dirname(__FILE__);
+            $current_directory = substr($current_directory, 0, -7);
+            $this->root = $current_directory;
+        }
 		
-		return $this->root;
-	}
-
-	private function get_delimiter()
-	{
-		return (true || $this->is_live) ? '/' : '\\';
-	}
-
-	private function check_delimiters($path)
-	{
-		return (true || $this->is_live) ? $path : str_replace('/', '\\', $path);
-	}
-
-	private static function get_class_name($path)
-	{
-		$path_array = explode('/', $path);
-		return array_pop($path_array);
-	}
-
-	private static function get_extension($type)
-	{
-		switch($type)
-		{
-			case 'collector' :
-			case 'controller' :
-			case 'model' :
-			case 'module' :
-			case 'router' :
-			case 'utility' :
-				$extension = '.class.inc.php';
-			break;
-			case 'view' :
-				$extension = '.tpl.php';
-			break;
-		}
-		return $extension;
-	}
-
-	public static function getImagePath($type, $file)
-	{
-		$path = self::instance()->get_root();
-		$path .= 'public';
-		$path .= self::instance()->get_delimiter();
-		$path .= $type;
-		$path .= self::instance()->get_delimiter();
-		$path .= self::instance()->check_delimiters($file);
+        return $this->root;
+    }
+
+    private function get_delimiter()
+    {
+        return (true || $this->is_live) ? '/' : '\\';
+    }
+
+    private function check_delimiters($path)
+    {
+        return (true || $this->is_live) ? $path : str_replace('/', '\\', $path);
+    }
+
+    private static function get_class_name($path)
+    {
+        $path_array = explode('/', $path);
+        return array_pop($path_array);
+    }
+
+    private static function get_extension($type)
+    {
+        switch($type)
+        {
+            case 'collector' :
+            case 'controller' :
+            case 'model' :
+            case 'module' :
+            case 'router' :
+            case 'utility' :
+                $extension = '.class.inc.php';
+            break;
+            case 'view' :
+                $extension = '.tpl.php';
+            break;
+        }
+        return $extension;
+    }
+
+    public static function getImagePath($type, $file)
+    {
+        $path = self::instance()->get_root();
+        $path .= 'public';
+        $path .= self::instance()->get_delimiter();
+        $path .= $type;
+        $path .= self::instance()->get_delimiter();
+        $path .= self::instance()->check_delimiters($file);
 		
-		return $path;
-	}
-
-	private static function get_path($type, $file)
-	{
-		$path = self::instance()->get_root();
-		$path .= $type;
-		$path .= self::instance()->get_delimiter();
-		$path .= self::instance()->check_delimiters($file);
-		$path .= self::get_extension($type);
+        return $path;
+    }
+
+    private static function get_path($type, $file)
+    {
+        $path = self::instance()->get_root();
+        $path .= $type;
+        $path .= self::instance()->get_delimiter();
+        $path .= self::instance()->check_delimiters($file);
+        $path .= self::get_extension($type);
 		
-		return $path;
-	}
-
-	private function get_included_files()
-	{
-		return $this->included_files;
-	}
-
-	private function add_included_file($path)
-	{
-		$this->included_files[] = $path;
-	}
-
-	public static function load($type, $files, $data = array())
-	{
-		foreach((array) $files as $file)
-		{
-			$file_path = self::instance()->get_path($type, $file);
-			if(in_array($file_path, self::instance()->get_included_files()) && $type !== 'view')
-				continue;
+        return $path;
+    }
+
+    private function get_included_files()
+    {
+        return $this->included_files;
+    }
+
+    private function add_included_file($path)
+    {
+        $this->included_files[] = $path;
+    }
+
+    public static function load($type, $files, $data = array())
+    {
+        foreach((array) $files as $file)
+        {
+            $file_path = self::instance()->get_path($type, $file);
+            if(in_array($file_path, self::instance()->get_included_files()) && $type !== 'view')
+                continue;
 			
-			self::instance()->add_included_file($file_path);
+            self::instance()->add_included_file($file_path);
 			
-			switch($type)
-			{
-				case 'images' :
-				case 'scripts' :
-				case 'styles' :
-					echo file_get_contents($file_path);
-				break;
-				case 'view' :
-					extract($data);
-					include($file_path);
-				break;
-				default :
-					include_once($file_path);
-				break;
-			}
-		}
-	}
-
-	private static function create_reflection_class($file)
-	{
-		$class_name = self::instance()->get_class_name($file);
-		return new ReflectionClass($class_name);
-	}
-
-	public static function loadInstance($type, $file)
-	{
-		self::load($type, $file);
+            switch($type)
+            {
+                case 'images' :
+                case 'scripts' :
+                case 'styles' :
+                    echo file_get_contents($file_path);
+                break;
+                case 'view' :
+                    extract($data);
+                    include($file_path);
+                break;
+                default :
+                    include_once($file_path);
+                break;
+            }
+        }
+    }
+
+    private static function create_reflection_class($file)
+    {
+        $class_name = self::instance()->get_class_name($file);
+        return new ReflectionClass($class_name);
+    }
+
+    public static function loadInstance($type, $file)
+    {
+        self::load($type, $file);
 		
-		$reflectionObject = self::create_reflection_class($file);
+        $reflectionObject = self::create_reflection_class($file);
 		
-		if(
-			$reflectionObject->hasMethod('instance') &&
-			$reflectionObject->getMethod('instance')->isStatic())
-		{
-			return $reflectionObject->getMethod('instance')->invoke(null);
-		}
-		trigger_error("Requested class cannot be instance'd: {$type}, {$file}");
-	}
-
-	public static function loadNew($type, $file, $data = array())
-	{
-		self::load($type, $file);
+        if(
+            $reflectionObject->hasMethod('instance') &&
+            $reflectionObject->getMethod('instance')->isStatic())
+        {
+            return $reflectionObject->getMethod('instance')->invoke(null);
+        }
+        trigger_error("Requested class cannot be instance'd: {$type}, {$file}");
+    }
+
+    public static function loadNew($type, $file, $data = array())
+    {
+        self::load($type, $file);
 		
-		$reflectionObject = self::create_reflection_class($file);
+        $reflectionObject = self::create_reflection_class($file);
 		
-		if($reflectionObject->hasMethod('__construct'))
-			return $reflectionObject->newInstanceArgs($data);
-		else
-			return $reflectionObject->newInstance();
-	}
-
-	public static function getRoot()
-	{
-		return self::instance()->get_root();
-	}
-
-	public static function isLive()
-	{
-		return self::instance()->is_live;
-	}
+        if($reflectionObject->hasMethod('__construct'))
+            return $reflectionObject->newInstanceArgs($data);
+        else
+            return $reflectionObject->newInstance();
+    }
+
+    public static function getRoot()
+    {
+        return self::instance()->get_root();
+    }
+
+    public static function isLive()
+    {
+        return self::instance()->is_live;
+    }
 
     public static function getRootURL($site = '')
     {